Skip to content

Commit c622ffb

Browse files
jeffgbutlerjeffgbutler
committed
ktlint round 1
1 parent 77159d5 commit c622ffb

19 files changed

+580
-527
lines changed

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/JoinCollector.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ class JoinCollector {
3838

3939
fun and(column: BasicColumn, condition: JoinCondition) =
4040
apply {
41-
andJoinCriteria.add(JoinCriterion.Builder()
42-
.withConnector("and")
43-
.withJoinColumn(column)
44-
.withJoinCondition(condition)
45-
.build())
41+
andJoinCriteria.add(
42+
JoinCriterion.Builder()
43+
.withConnector("and")
44+
.withJoinColumn(column)
45+
.withJoinCondition(condition)
46+
.build()
47+
)
4648
}
4749
}

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.mybatis.dynamic.sql.util.Buildable
2222
typealias DeleteCompleter = KotlinDeleteBuilder.() -> Unit
2323

2424
class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
25-
KotlinBaseBuilder<DeleteDSL<DeleteModel>, KotlinDeleteBuilder>(), Buildable<DeleteModel> {
25+
KotlinBaseBuilder<DeleteDSL<DeleteModel>, KotlinDeleteBuilder>(), Buildable<DeleteModel> {
2626

2727
override fun build(): DeleteModel = dsl.build()
2828

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinSelectBuilder.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ package org.mybatis.dynamic.sql.util.kotlin
1818
import org.mybatis.dynamic.sql.BasicColumn
1919
import org.mybatis.dynamic.sql.SortSpecification
2020
import org.mybatis.dynamic.sql.SqlTable
21+
import org.mybatis.dynamic.sql.select.QueryExpressionDSL
2122
import org.mybatis.dynamic.sql.select.SelectModel
2223
import org.mybatis.dynamic.sql.util.Buildable
23-
import org.mybatis.dynamic.sql.select.QueryExpressionDSL
2424

2525
typealias SelectCompleter = KotlinSelectBuilder.() -> Unit
2626

@@ -90,7 +90,9 @@ class KotlinSelectBuilder(private val fromGatherer: QueryExpressionDSL.FromGathe
9090
return dsl
9191
} catch (e: UninitializedPropertyAccessException) {
9292
throw UninitializedPropertyAccessException(
93-
"You must specify a \"from\" clause before any other clauses in a select statement", e)
93+
"You must specify a \"from\" clause before any other clauses in a select statement",
94+
e
95+
)
9496
}
9597
}
9698
}

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
2727
import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
2828
import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
2929
import org.mybatis.dynamic.sql.util.kotlin.InsertSelectCompleter
30-
import org.mybatis.dynamic.sql.util.kotlin.KotlinSelectBuilder
31-
import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
32-
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
33-
import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
3430
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.count
3531
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.countDistinct
3632
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.countFrom
@@ -41,6 +37,10 @@ import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.into
4137
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.select
4238
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.selectDistinct
4339
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.update
40+
import org.mybatis.dynamic.sql.util.kotlin.KotlinSelectBuilder
41+
import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
42+
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
43+
import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
4444

4545
fun count(column: BasicColumn, completer: CountCompleter) =
4646
count(column, completer).render(RenderingStrategies.MYBATIS3)

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/NamedParameterJdbcTemplateExtensions.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,18 @@ fun NamedParameterJdbcTemplate.selectDistinct(vararg selectList: BasicColumn, co
131131

132132
fun NamedParameterJdbcTemplate.selectDistinct(selectList: List<BasicColumn>, completer: SelectCompleter) =
133133
SelectListMapperGatherer(
134-
org.mybatis.dynamic.sql.util.kotlin.spring.selectDistinct(selectList, completer), this)
134+
org.mybatis.dynamic.sql.util.kotlin.spring.selectDistinct(selectList, completer),
135+
this
136+
)
135137

136138
fun NamedParameterJdbcTemplate.selectOne(vararg selectList: BasicColumn, completer: SelectCompleter) =
137139
selectOne(selectList.toList(), completer)
138140

139141
fun NamedParameterJdbcTemplate.selectOne(selectList: List<BasicColumn>, completer: SelectCompleter) =
140142
SelectOneMapperGatherer(
141-
org.mybatis.dynamic.sql.util.kotlin.spring.select(selectList, completer), this)
143+
org.mybatis.dynamic.sql.util.kotlin.spring.select(selectList, completer),
144+
this
145+
)
142146

143147
fun <T> NamedParameterJdbcTemplate.selectList(
144148
selectStatement: SelectStatementProvider,

‎src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
2828
import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
2929
import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
3030
import org.mybatis.dynamic.sql.util.kotlin.InsertSelectCompleter
31-
import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
32-
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
33-
import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
3431
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.count
3532
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.countDistinct
3633
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.countFrom
@@ -41,6 +38,9 @@ import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.into
4138
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.select
4239
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.selectDistinct
4340
import org.mybatis.dynamic.sql.util.kotlin.KotlinModelBuilderFunctions.update
41+
import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
42+
import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
43+
import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
4444

4545
fun count(column: BasicColumn, completer: CountCompleter) =
4646
count(column, completer).render(RenderingStrategies.SPRING_NAMED_PARAMETER)

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapper.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ interface PersonMapper : CommonCountMapper, CommonDeleteMapper, CommonInsertMapp
3939

4040
@SelectProvider(type = SqlProviderAdapter::class, method = "select")
4141
@Results(
42-
id = "PersonResult", value = [
42+
id = "PersonResult",
43+
value = [
4344
Result(column = "A_ID", property = "id", jdbcType = JdbcType.INTEGER, id = true),
4445
Result(column = "first_name", property = "firstName", jdbcType = JdbcType.VARCHAR),
4546
Result(
@@ -56,7 +57,8 @@ interface PersonMapper : CommonCountMapper, CommonDeleteMapper, CommonInsertMapp
5657
typeHandler = YesNoTypeHandler::class
5758
),
5859
Result(column = "occupation", property = "occupation", jdbcType = JdbcType.VARCHAR),
59-
Result(column = "address_id", property = "addressId", jdbcType = JdbcType.INTEGER)]
60+
Result(column = "address_id", property = "addressId", jdbcType = JdbcType.INTEGER)
61+
]
6062
)
6163
fun selectMany(selectStatement: SelectStatementProvider): List<PersonRecord>
6264

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapper.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ interface PersonWithAddressMapper {
3434

3535
@SelectProvider(type = SqlProviderAdapter::class, method = "select")
3636
@Results(
37-
id = "PersonWithAddressResult", value = [
37+
id = "PersonWithAddressResult",
38+
value = [
3839
Result(column = "A_ID", property = "id", jdbcType = JdbcType.INTEGER, id = true),
3940
Result(column = "first_name", property = "firstName", jdbcType = JdbcType.VARCHAR),
4041
Result(

‎src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonWithAddressMapperExtensions.kt‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,12 @@ import org.mybatis.dynamic.sql.util.kotlin.mybatis3.selectList
3333
import org.mybatis.dynamic.sql.util.kotlin.mybatis3.selectOne
3434

3535
fun PersonWithAddressMapper.selectOne(completer: SelectCompleter): PersonWithAddress? {
36-
val start = KotlinSelectBuilder(select(id.`as`("A_ID"), firstName, lastName, birthDate,
37-
employed, occupation, Address.id, Address.streetAddress, Address.city, Address.state)).apply {
36+
val start = KotlinSelectBuilder(
37+
select(
38+
id.`as`("A_ID"), firstName, lastName, birthDate, employed, occupation, Address.id,
39+
Address.streetAddress, Address.city, Address.state
40+
)
41+
).apply {
3842
from(Person)
3943
fullJoin(Address) {
4044
on(Person.addressId, equalTo(Address.id))
@@ -45,8 +49,12 @@ fun PersonWithAddressMapper.selectOne(completer: SelectCompleter): PersonWithAdd
4549
}
4650

4751
fun PersonWithAddressMapper.select(completer: SelectCompleter): List<PersonWithAddress> {
48-
val start = KotlinSelectBuilder(select(id.`as`("A_ID"), firstName, lastName, birthDate,
49-
employed, occupation, Address.id, Address.streetAddress, Address.city, Address.state)).apply {
52+
val start = KotlinSelectBuilder(
53+
select(
54+
id.`as`("A_ID"), firstName, lastName, birthDate, employed, occupation, Address.id,
55+
Address.streetAddress, Address.city, Address.state
56+
)
57+
).apply {
5058
from(Person, "p")
5159
fullJoin(Address) {
5260
on(Person.addressId, equalTo(Address.id))
@@ -57,8 +65,12 @@ fun PersonWithAddressMapper.select(completer: SelectCompleter): List<PersonWithA
5765
}
5866

5967
fun PersonWithAddressMapper.selectDistinct(completer: SelectCompleter): List<PersonWithAddress> {
60-
val start = KotlinSelectBuilder(selectDistinct(id.`as`("A_ID"), firstName, lastName,
61-
birthDate, employed, occupation, Address.id, Address.streetAddress, Address.city, Address.state)).apply {
68+
val start = KotlinSelectBuilder(
69+
selectDistinct(
70+
id.`as`("A_ID"), firstName, lastName, birthDate, employed, occupation, Address.id,
71+
Address.streetAddress, Address.city, Address.state
72+
)
73+
).apply {
6274
from(Person, "p")
6375
fullJoin(Address) {
6476
on(Person.addressId, equalTo(Address.id))

0 commit comments

Comments
 (0)