Skip to content

Commit 85e7438

Browse files
vnikolovavnikolova
committed
fix detekt issues and wrong code-block lines
1 parent d4d069c commit 85e7438

File tree

12 files changed

+22
-26
lines changed

12 files changed

+22
-26
lines changed

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example
22

3-
import org.example.tables.*
43
import org.example.examples.*
4+
import org.example.tables.*
55
import org.jetbrains.exposed.sql.Database
66
import org.jetbrains.exposed.sql.DatabaseConfig
77
import org.jetbrains.exposed.sql.SchemaUtils

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/entities/DirectorEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.entities
22

3-
import org.example.tables.DirectorsTable
43
import org.example.tables.DirectorsCompositeIdTable
4+
import org.example.tables.DirectorsTable
55
import org.example.tables.StarWarsFilmsWithCompositeRefTable
66
import org.jetbrains.exposed.dao.CompositeEntity
77
import org.jetbrains.exposed.dao.CompositeEntityClass

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/entities/StarWarsFilmEntity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.example.entities
22

3-
import org.example.tables.StarWarsFilmsTable
3+
import org.example.tables.StarWarsFilmActorsTable
44
import org.example.tables.StarWarsFilmRelationsTable
5+
import org.example.tables.StarWarsFilmsTable
6+
import org.example.tables.StarWarsFilmsWithCompositeRefTable
57
import org.example.tables.StarWarsFilmsWithDirectorTable
68
import org.example.tables.UserRatingsTable
7-
import org.example.tables.StarWarsFilmActorsTable
8-
import org.example.tables.StarWarsFilmsWithCompositeRefTable
99
import org.jetbrains.exposed.dao.IntEntity
1010
import org.jetbrains.exposed.dao.IntEntityClass
1111
import org.jetbrains.exposed.dao.id.EntityID

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/entities/UserEntity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.entities
22

3-
import org.example.tables.UsersTable
43
import org.example.tables.UserRatingsTable
4+
import org.example.tables.UsersTable
55
import org.jetbrains.exposed.dao.IntEntity
66
import org.jetbrains.exposed.dao.IntEntityClass
77
import org.jetbrains.exposed.dao.id.EntityID
@@ -24,6 +24,7 @@ class UserOrderedEntity(id: EntityID<Int>) : IntEntity(id) {
2424
companion object : IntEntityClass<UserOrderedEntity>(UsersTable)
2525

2626
var name by UsersTable.name
27+
2728
/*
2829
Without infix notation:
2930
@@ -37,5 +38,3 @@ class UserOrderedEntity(id: EntityID<Int>) : IntEntity(id) {
3738
UserRatingsTable.id to SortOrder.ASC
3839
)
3940
}
40-
41-

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/entities/UserRatingEntity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ class UserRatingWithOptionalUserEntity(id: EntityID<Int>) : IntEntity(id) {
2828
var film by StarWarsFilmEntity referencedOn UserRatingsWithOptionalUserTable.film // use referencedOn for normal references
2929
var user by UserEntity optionalReferencedOn UserRatingsWithOptionalUserTable.user
3030
}
31-

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/examples/ManyToManyExamples.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package org.example.examples
22

3-
import org.example.entities.StarWarsFilmEntity
43
import org.example.entities.ActorEntity
4+
import org.example.entities.StarWarsFilmEntity
55
import org.jetbrains.exposed.sql.SizedCollection
66

77
const val MOVIE2_SEQUEL_ID = 9
88

99
class ManyToManyExamples {
1010
fun getActors() {
1111
// create an actor
12-
val actor = ActorEntity.new{
12+
val actor = ActorEntity.new {
1313
firstname = "Daisy"
1414
lastname = "Ridley"
1515
}
1616
// create film
17-
val film = StarWarsFilmEntity.new{
17+
val film = StarWarsFilmEntity.new {
1818
name = "The Rise of Skywalker"
1919
sequelId = MOVIE2_SEQUEL_ID
2020
director = "J.J. Abrams"

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/examples/OneToManyExamples.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import org.example.entities.UserEntity
55
import org.example.entities.UserRatingEntity
66

77
const val MOVIE_SEQUEL_ID = 8
8+
const val MOVIE_RATING = 4
89

910
class OneToManyExamples {
1011
fun queryRatings() {
1112
// create film
12-
val starWarsFilm = StarWarsFilmEntity.new{
13+
val starWarsFilm = StarWarsFilmEntity.new {
1314
name = "The Last Jedi"
1415
sequelId = MOVIE_SEQUEL_ID
1516
director = "Rian Johnson"
@@ -19,7 +20,7 @@ class OneToManyExamples {
1920
}
2021

2122
val filmRating = UserRatingEntity.new {
22-
value = 4
23+
value = MOVIE_RATING
2324
film = starWarsFilm
2425
user = user1
2526
}

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/examples/ParentChildExamples.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.example.examples
22

3-
import org.example.entities.StarWarsFilmWithParentAndChildEntity
43
import org.example.entities.DirectorEntity
4+
import org.example.entities.StarWarsFilmWithParentAndChildEntity
55
import org.example.tables.Genre
66
import org.jetbrains.exposed.sql.SizedCollection
77

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/tables/DirectorsTable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object DirectorsTable : IntIdTable("directors") {
1212
}
1313

1414
object DirectorsCompositeIdTable : CompositeIdTable() {
15-
val name = varchar("name", 50).entityId()
15+
val name = varchar("name", NAME_LENGTH).entityId()
1616
val guildId = uuid("guild_id").autoGenerate().entityId()
1717
val genre = enumeration<Genre>("genre")
1818

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/tables/StarWarsFilmsTable.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object StarWarsFilmsTable : IntIdTable() {
1111
val director = varchar("director", MAX_VARCHAR_LENGTH)
1212
}
1313

14-
object StarWarsFilmsWithDirectorTable: IntIdTable() {
14+
object StarWarsFilmsWithDirectorTable : IntIdTable() {
1515
val name = varchar("name", MAX_VARCHAR_LENGTH)
1616
val director = reference("director", DirectorsTable)
1717
}
@@ -24,8 +24,8 @@ object StarWarsFilmRelationsTable : Table() {
2424

2525
object StarWarsFilmsWithCompositeRefTable : IntIdTable() {
2626
val sequelId = integer("sequel_id").uniqueIndex()
27-
val name = varchar("name", 50)
28-
val directorName = varchar("director_name", 50)
27+
val name = varchar("name", MAX_VARCHAR_LENGTH)
28+
val directorName = varchar("director_name", MAX_VARCHAR_LENGTH)
2929
val directorGuildId = uuid("director_guild_id")
3030

3131
init {

‎documentation-website/Writerside/snippets/exposed-dao-relationships/src/main/kotlin/org/example/tables/UserRatingsTable.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.example.tables
22

3-
import org.example.tables.UsersTable
4-
import org.example.tables.StarWarsFilmsTable
53
import org.jetbrains.exposed.dao.id.IntIdTable
64

75
object UserRatingsTable : IntIdTable() {
@@ -15,4 +13,3 @@ object UserRatingsWithOptionalUserTable : IntIdTable() {
1513
val film = reference("film", StarWarsFilmsTable)
1614
val user = reference("user", UsersTable).nullable()
1715
}
18-

‎documentation-website/Writerside/topics/DAO-Relationships.topic

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<tab id="user-entity" title="UserEntity">
4242
<code-block lang="kotlin"
4343
src="exposed-dao-relationships/src/main/kotlin/org/example/entities/UserEntity.kt"
44-
include-lines="15-18,20"
44+
include-lines="16-19,21"
4545
/>
4646
</tab>
4747
</tabs>
@@ -147,13 +147,13 @@
147147
</p>
148148
<code-block lang="kotlin"
149149
src="exposed-dao-relationships/src/main/kotlin/org/example/entities/UserEntity.kt"
150-
include-lines="23-26,35-39"
150+
include-lines="23-26,36-40"
151151
/>
152152
<p>Without using the <a href="https://kotlinlang.org/docs/functions.html#infix-notation">infix notation</a>, the <code>orderBy</code> method is chained
153153
after <code>referrersOn</code>:</p>
154154
<code-block lang="kotlin"
155155
src="exposed-dao-relationships/src/main/kotlin/org/example/entities/UserEntity.kt"
156-
include-lines="23-26,30-33,39"
156+
include-lines="23-26,31-34,40"
157157
/>
158158
</chapter>
159159
<chapter title="Many-to-many reference" id="many-to-many-reference">
@@ -193,7 +193,7 @@
193193
<code>via</code> keyword:</p>
194194
<code-block lang="kotlin"
195195
src="exposed-dao-relationships/src/main/kotlin/org/example/entities/StarWarsFilmEntity.kt"
196-
include-lines="24"
196+
include-lines="26"
197197
/>
198198
<p>The final <code>StarWarsFilmEntity</code> will look in the following way:</p>
199199
<code-block lang="kotlin"

0 commit comments

Comments
 (0)