Skip to content

Commit 6550b43

Browse files
renovate[bot]nakamura-to
renovate[bot]
and
nakamura-to
authored
Update plugin com.diffplug.spotless to v6.15.0 (#915)
* Update plugin com.diffplug.spotless to v6.15.0 * Update plugin com.diffplug.spotless to v6.15.0 * Update ktlint to v0.48.2 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Toshihiro Nakamura <[email protected]>
1 parent a30626b commit 6550b43

28 files changed

+216
-214
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ subprojects {
120120
googleJavaFormat("1.12.0")
121121
}
122122
kotlin {
123-
ktlint("0.45.2")
123+
ktlint("0.48.2")
124124
trimTrailingWhitespace()
125125
endWithNewline()
126126
}

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/KEntityql.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class KEntityql(config: Config) {
2323

2424
fun <ENTITY> from(
2525
entityMetamodel: EntityMetamodel<ENTITY>,
26-
block: SelectSettings.() -> Unit = {}
26+
block: SelectSettings.() -> Unit = {},
2727
): KEntityqlSelectStarting<ENTITY> {
2828
val statement = entityql.from(entityMetamodel, block)
2929
return KEntityqlSelectStarting(statement)
@@ -32,7 +32,7 @@ class KEntityql(config: Config) {
3232
fun <ENTITY> update(
3333
entityMetamodel: EntityMetamodel<ENTITY>,
3434
entity: ENTITY,
35-
block: UpdateSettings.() -> Unit = {}
35+
block: UpdateSettings.() -> Unit = {},
3636
): KStatement<Result<ENTITY>> {
3737
val statement = entityql.update(entityMetamodel, entity, block)
3838
return KEntityqlUpdateStatement(statement)
@@ -41,7 +41,7 @@ class KEntityql(config: Config) {
4141
fun <ENTITY> delete(
4242
entityMetamodel: EntityMetamodel<ENTITY>,
4343
entity: ENTITY,
44-
block: DeleteSettings.() -> Unit = {}
44+
block: DeleteSettings.() -> Unit = {},
4545
): KStatement<Result<ENTITY>> {
4646
val statement = entityql.delete(entityMetamodel, entity, block)
4747
return KEntityqlDeleteStatement(statement)
@@ -50,7 +50,7 @@ class KEntityql(config: Config) {
5050
fun <ENTITY> insert(
5151
entityMetamodel: EntityMetamodel<ENTITY>,
5252
entity: ENTITY,
53-
block: InsertSettings.() -> Unit = {}
53+
block: InsertSettings.() -> Unit = {},
5454
): KStatement<Result<ENTITY>> {
5555
val statement = entityql.insert(entityMetamodel, entity, block)
5656
return KEntityqlInsertStatement(statement)
@@ -59,7 +59,7 @@ class KEntityql(config: Config) {
5959
fun <ENTITY> update(
6060
entityMetamodel: EntityMetamodel<ENTITY>,
6161
entities: List<ENTITY>,
62-
block: UpdateSettings.() -> Unit = {}
62+
block: UpdateSettings.() -> Unit = {},
6363
): KStatement<BatchResult<ENTITY>> {
6464
val statement = entityql.update(entityMetamodel, entities, block)
6565
return KEntityqlBatchUpdateStatement(statement)
@@ -68,7 +68,7 @@ class KEntityql(config: Config) {
6868
fun <ENTITY> delete(
6969
entityMetamodel: EntityMetamodel<ENTITY>,
7070
entities: List<ENTITY>,
71-
block: DeleteSettings.() -> Unit = {}
71+
block: DeleteSettings.() -> Unit = {},
7272
): KStatement<BatchResult<ENTITY>> {
7373
val statement = entityql.delete(entityMetamodel, entities, block)
7474
return KEntityqlBatchDeleteStatement(statement)
@@ -77,7 +77,7 @@ class KEntityql(config: Config) {
7777
fun <ENTITY> insert(
7878
entityMetamodel: EntityMetamodel<ENTITY>,
7979
entities: List<ENTITY>,
80-
block: InsertSettings.() -> Unit = {}
80+
block: InsertSettings.() -> Unit = {},
8181
): KStatement<BatchResult<ENTITY>> {
8282
val statement = entityql.insert(entityMetamodel, entities, block)
8383
return KEntityqlBatchInsertStatement(statement)

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/KNativeSql.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ class KNativeSql(config: Config?) {
1717

1818
fun <ENTITY> from(
1919
entityMetamodel: EntityMetamodel<ENTITY>,
20-
block: SelectSettings.() -> Unit = {}
20+
block: SelectSettings.() -> Unit = {},
2121
): KNativeSqlSelectStarting<ENTITY> {
2222
val statement = nativeSql.from(entityMetamodel, block)
2323
return KNativeSqlSelectStarting(statement)
2424
}
2525

2626
fun <ENTITY> update(
2727
entityMetamodel: EntityMetamodel<ENTITY>,
28-
block: UpdateSettings.() -> Unit = {}
28+
block: UpdateSettings.() -> Unit = {},
2929
): KNativeSqlUpdateStarting {
3030
val statement = nativeSql.update(entityMetamodel, block)
3131
return KNativeSqlUpdateStarting(statement)
3232
}
3333

3434
fun <ENTITY> delete(
3535
entityMetamodel: EntityMetamodel<ENTITY>,
36-
block: DeleteSettings.() -> Unit = {}
36+
block: DeleteSettings.() -> Unit = {},
3737
): KNativeSqlDeleteStarting {
3838
val statement = nativeSql.delete(entityMetamodel, block)
3939
return KNativeSqlDeleteStarting(statement)
4040
}
4141

4242
fun <ENTITY> insert(
4343
entityMetamodel: EntityMetamodel<ENTITY>,
44-
block: InsertSettings.() -> Unit = {}
44+
block: InsertSettings.() -> Unit = {},
4545
): KNativeSqlInsertStarting {
4646
val statement = nativeSql.insert(entityMetamodel, block)
4747
return KNativeSqlInsertStarting(statement)

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KSetDeclaration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class KSetDeclaration(private val declaration: SetDeclaration) {
1111

1212
fun <PROPERTY> value(
1313
left: PropertyMetamodel<PROPERTY>,
14-
right: PropertyMetamodel<PROPERTY>
14+
right: PropertyMetamodel<PROPERTY>,
1515
) {
1616
declaration.value(left, right)
1717
}

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KSubSelectFromDeclaration.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ class KSubSelectFromDeclaration<ENTITY>(private val declaration: SubSelectFromDe
1717

1818
fun innerJoin(
1919
entityMetamodel: EntityMetamodel<*>,
20-
block: KJoinDeclaration.() -> Unit
20+
block: KJoinDeclaration.() -> Unit,
2121
): KSubSelectFromDeclaration<ENTITY> {
2222
declaration.innerJoin(entityMetamodel) { block(KJoinDeclaration(it)) }
2323
return this
2424
}
2525

2626
fun leftJoin(
2727
entityMetamodel: EntityMetamodel<*>,
28-
block: KJoinDeclaration.() -> Unit
28+
block: KJoinDeclaration.() -> Unit,
2929
): KSubSelectFromDeclaration<ENTITY> {
3030
declaration.leftJoin(entityMetamodel) { block(KJoinDeclaration(it)) }
3131
return this
@@ -45,8 +45,8 @@ class KSubSelectFromDeclaration<ENTITY>(private val declaration: SubSelectFromDe
4545
declaration.having {
4646
block(
4747
KHavingDeclaration(
48-
it
49-
)
48+
it,
49+
),
5050
)
5151
}
5252
return this
@@ -71,15 +71,15 @@ class KSubSelectFromDeclaration<ENTITY>(private val declaration: SubSelectFromDe
7171

7272
fun <PROPERTY1, PROPERTY2> select(
7373
first: PropertyMetamodel<PROPERTY1>,
74-
second: PropertyMetamodel<PROPERTY2>
74+
second: PropertyMetamodel<PROPERTY2>,
7575
): SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>> {
7676
return declaration.select(first, second)
7777
}
7878

7979
fun select(
8080
propertyMetamodel1: PropertyMetamodel<*>,
8181
propertyMetamodel2: PropertyMetamodel<*>,
82-
vararg propertyMetamodels: PropertyMetamodel<*>
82+
vararg propertyMetamodels: PropertyMetamodel<*>,
8383
): SubSelectContext<List<PropertyMetamodel<*>>> {
8484
return declaration.select(propertyMetamodel1, propertyMetamodel2, *propertyMetamodels)
8585
}

‎doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/declaration/KWhereDeclaration.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class KWhereDeclaration(declaration: WhereDeclaration) : org.seasar.doma.kotlin.
2121
fun <PROPERTY> between(
2222
propertyMetamodel: PropertyMetamodel<PROPERTY>,
2323
start: PROPERTY?,
24-
end: PROPERTY?
24+
end: PROPERTY?,
2525
) {
2626
declaration.between(propertyMetamodel, start, end)
2727
}
@@ -36,42 +36,42 @@ class KWhereDeclaration(declaration: WhereDeclaration) : org.seasar.doma.kotlin.
3636

3737
fun <PROPERTY> `in`(
3838
left: PropertyMetamodel<PROPERTY>,
39-
right: SubSelectContext<PropertyMetamodel<PROPERTY>>
39+
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
4040
) {
4141
declaration.`in`(left, right)
4242
}
4343

4444
fun <PROPERTY> notIn(
4545
left: PropertyMetamodel<PROPERTY>,
46-
right: SubSelectContext<PropertyMetamodel<PROPERTY>>
46+
right: SubSelectContext<PropertyMetamodel<PROPERTY>>,
4747
) {
4848
declaration.notIn(left, right)
4949
}
5050

5151
fun <PROPERTY1, PROPERTY2> `in`(
5252
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
53-
right: List<Tuple2<PROPERTY1, PROPERTY2>>?
53+
right: List<Tuple2<PROPERTY1, PROPERTY2>>?,
5454
) {
5555
declaration.`in`(left, right)
5656
}
5757

5858
fun <PROPERTY1, PROPERTY2> notIn(
5959
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
60-
right: List<Tuple2<PROPERTY1, PROPERTY2>>?
60+
right: List<Tuple2<PROPERTY1, PROPERTY2>>?,
6161
) {
6262
declaration.notIn(left, right)
6363
}
6464

6565
fun <PROPERTY1, PROPERTY2> `in`(
6666
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
67-
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>
67+
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
6868
) {
6969
declaration.`in`(left, right)
7070
}
7171

7272
fun <PROPERTY1, PROPERTY2> notIn(
7373
left: Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>,
74-
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>
74+
right: SubSelectContext<Tuple2<PropertyMetamodel<PROPERTY1>, PropertyMetamodel<PROPERTY2>>>,
7575
) {
7676
declaration.notIn(left, right)
7777
}

0 commit comments

Comments
 (0)