Skip to content

Commit a7cfd83

Browse files
jeffgbutlerjeffgbutler
authored
Merge pull request #1004 from jeffgbutler/fix-kotlin-compile-problem
Fix kotlin compile problem
2 parents fe873ee + 176ebf2 commit a7cfd83

File tree

5 files changed

+15
-74
lines changed

5 files changed

+15
-74
lines changed

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<module.name>org.mybatis.dynamic.sql</module.name>
7171

72-
<kotlin.version>2.1.21</kotlin.version>
72+
<kotlin.version>2.2.21</kotlin.version>
7373
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
7474
<kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
7575
<kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
@@ -95,7 +95,7 @@
9595
</dependency>
9696
<dependency>
9797
<groupId>org.jetbrains.kotlin</groupId>
98-
<artifactId>kotlin-stdlib-jdk8</artifactId>
98+
<artifactId>kotlin-stdlib</artifactId>
9999
<version>${kotlin.version}</version>
100100
<scope>provided</scope>
101101
<optional>true</optional>

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,6 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
317317

318318
fun <T : Any> BindableColumn<T>.isIn(vararg values: T) = isIn(values.asList())
319319

320-
@JvmName("isInArray")
321-
infix fun <T : Any> BindableColumn<T>.isIn(values: Array<out T>) =
322-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isIn(values))
323-
324320
infix fun <T : Any> BindableColumn<T>.isIn(values: Collection<T>) =
325321
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isIn(values))
326322

@@ -329,19 +325,11 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
329325

330326
fun <T : Any> BindableColumn<T>.isInWhenPresent(vararg values: T?) = isInWhenPresent(values.asList())
331327

332-
@JvmName("isInArrayWhenPresent")
333-
infix fun <T : Any> BindableColumn<T>.isInWhenPresent(values: Array<out T?>?) =
334-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInWhenPresent(values))
335-
336328
infix fun <T : Any> BindableColumn<T>.isInWhenPresent(values: Collection<T?>?) =
337329
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInWhenPresent(values))
338330

339331
fun <T : Any> BindableColumn<T>.isNotIn(vararg values: T) = isNotIn(values.asList())
340332

341-
@JvmName("isNotInArray")
342-
infix fun <T : Any> BindableColumn<T>.isNotIn(values: Array<out T>) =
343-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotIn(values))
344-
345333
infix fun <T : Any> BindableColumn<T>.isNotIn(values: Collection<T>) =
346334
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotIn(values))
347335

@@ -350,10 +338,6 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
350338

351339
fun <T : Any> BindableColumn<T>.isNotInWhenPresent(vararg values: T?) = isNotInWhenPresent(values.asList())
352340

353-
@JvmName("isNotInArrayWhenPresent")
354-
infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Array<out T?>?) =
355-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))
356-
357341
infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Collection<T?>?) =
358342
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))
359343

@@ -410,40 +394,24 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
410394

411395
fun BindableColumn<String>.isInCaseInsensitive(vararg values: String) = isInCaseInsensitive(values.asList())
412396

413-
@JvmName("isInArrayCaseInsensitive")
414-
infix fun BindableColumn<String>.isInCaseInsensitive(values: Array<out String>) =
415-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitive(values))
416-
417397
infix fun BindableColumn<String>.isInCaseInsensitive(values: Collection<String>) =
418398
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitive(values))
419399

420400
fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(vararg values: String?) =
421401
isInCaseInsensitiveWhenPresent(values.asList())
422402

423-
@JvmName("isInArrayCaseInsensitiveWhenPresent")
424-
infix fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(values: Array<out String?>?) =
425-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitiveWhenPresent(values))
426-
427403
infix fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
428404
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitiveWhenPresent(values))
429405

430406
fun BindableColumn<String>.isNotInCaseInsensitive(vararg values: String) =
431407
isNotInCaseInsensitive(values.asList())
432408

433-
@JvmName("isNotInArrayCaseInsensitive")
434-
infix fun BindableColumn<String>.isNotInCaseInsensitive(values: Array<out String>) =
435-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitive(values))
436-
437409
infix fun BindableColumn<String>.isNotInCaseInsensitive(values: Collection<String>) =
438410
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitive(values))
439411

440412
fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(vararg values: String?) =
441413
isNotInCaseInsensitiveWhenPresent(values.asList())
442414

443-
@JvmName("isNotInArrayCaseInsensitiveWhenPresent")
444-
infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Array<out String?>?) =
445-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))
446-
447415
infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
448416
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))
449417

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -286,36 +286,24 @@ fun <T : Any> isLessThanOrEqualToWhenPresent(value: T?): IsLessThanOrEqualToWhen
286286

287287
fun <T : Any> isIn(vararg values: T): IsIn<T> = isIn(values.asList())
288288

289-
@JvmName("isInArray")
290-
fun <T : Any> isIn(values: Array<out T>): IsIn<T> = SqlBuilder.isIn(values.asList())
291-
292289
fun <T : Any> isIn(values: Collection<T>): IsIn<T> = SqlBuilder.isIn(values)
293290

294291
fun <T : Any> isIn(subQuery: KotlinSubQueryBuilder.() -> Unit): IsInWithSubselect<T> =
295292
SqlBuilder.isIn(KotlinSubQueryBuilder().apply(subQuery))
296293

297294
fun <T : Any> isInWhenPresent(vararg values: T?): IsInWhenPresent<T> = isInWhenPresent(values.asList())
298295

299-
@JvmName("isInArrayWhenPresent")
300-
fun <T : Any> isInWhenPresent(values: Array<out T?>?): IsInWhenPresent<T> = SqlBuilder.isInWhenPresent(values?.asList())
301-
302296
fun <T : Any> isInWhenPresent(values: Collection<T?>?): IsInWhenPresent<T> = SqlBuilder.isInWhenPresent(values)
303297

304298
fun <T : Any> isNotIn(vararg values: T): IsNotIn<T> = isNotIn(values.asList())
305299

306-
@JvmName("isNotInArray")
307-
fun <T : Any> isNotIn(values: Array<out T>): IsNotIn<T> = SqlBuilder.isNotIn(values.asList())
308-
309300
fun <T : Any> isNotIn(values: Collection<T>): IsNotIn<T> = SqlBuilder.isNotIn(values)
310301

311302
fun <T : Any> isNotIn(subQuery: KotlinSubQueryBuilder.() -> Unit): IsNotInWithSubselect<T> =
312303
SqlBuilder.isNotIn(KotlinSubQueryBuilder().apply(subQuery))
313304

314305
fun <T : Any> isNotInWhenPresent(vararg values: T?): IsNotInWhenPresent<T> = isNotInWhenPresent(values.asList())
315306

316-
@JvmName("isNotInArrayWhenPresent")
317-
fun <T : Any> isNotInWhenPresent(values: Array<out T?>?): IsNotInWhenPresent<T> = SqlBuilder.isNotInWhenPresent(values?.asList())
318-
319307
fun <T : Any> isNotInWhenPresent(values: Collection<T?>?): IsNotInWhenPresent<T> = SqlBuilder.isNotInWhenPresent(values)
320308

321309
fun <T : Any> isBetween(value1: T): BetweenBuilder<T> = BetweenBuilder(value1)
@@ -354,40 +342,24 @@ fun isNotLikeCaseInsensitiveWhenPresent(value: String?): IsNotLikeCaseInsensitiv
354342

355343
fun isInCaseInsensitive(vararg values: String): IsInCaseInsensitive<String> = isInCaseInsensitive(values.asList())
356344

357-
@JvmName("isInArrayCaseInsensitive")
358-
fun isInCaseInsensitive(values: Array<out String>): IsInCaseInsensitive<String> =
359-
SqlBuilder.isInCaseInsensitive(values.asList())
360-
361345
fun isInCaseInsensitive(values: Collection<String>): IsInCaseInsensitive<String> =
362346
SqlBuilder.isInCaseInsensitive(values)
363347

364348
fun isInCaseInsensitiveWhenPresent(vararg values: String?): IsInCaseInsensitiveWhenPresent<String> =
365349
isInCaseInsensitiveWhenPresent(values.asList())
366350

367-
@JvmName("isInArrayCaseInsensitiveWhenPresent")
368-
fun isInCaseInsensitiveWhenPresent(values: Array<out String?>?): IsInCaseInsensitiveWhenPresent<String> =
369-
SqlBuilder.isInCaseInsensitiveWhenPresent(values?.asList())
370-
371351
fun isInCaseInsensitiveWhenPresent(values: Collection<String?>?): IsInCaseInsensitiveWhenPresent<String> =
372352
SqlBuilder.isInCaseInsensitiveWhenPresent(values)
373353

374354
fun isNotInCaseInsensitive(vararg values: String): IsNotInCaseInsensitive<String> =
375355
isNotInCaseInsensitive(values.asList())
376356

377-
@JvmName("isNotInArrayCaseInsensitive")
378-
fun isNotInCaseInsensitive(values: Array<out String>): IsNotInCaseInsensitive<String> =
379-
SqlBuilder.isNotInCaseInsensitive(values.asList())
380-
381357
fun isNotInCaseInsensitive(values: Collection<String>): IsNotInCaseInsensitive<String> =
382358
SqlBuilder.isNotInCaseInsensitive(values)
383359

384360
fun isNotInCaseInsensitiveWhenPresent(vararg values: String?): IsNotInCaseInsensitiveWhenPresent<String> =
385361
isNotInCaseInsensitiveWhenPresent(values.asList())
386362

387-
@JvmName("isNotInArrayCaseInsensitiveWhenPresent")
388-
fun isNotInCaseInsensitiveWhenPresent(values: Array<out String?>?): IsNotInCaseInsensitiveWhenPresent<String> =
389-
SqlBuilder.isNotInCaseInsensitiveWhenPresent(values?.asList())
390-
391363
fun isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?): IsNotInCaseInsensitiveWhenPresent<String> =
392364
SqlBuilder.isNotInCaseInsensitiveWhenPresent(values)
393365

‎src/test/java/examples/mysql/MySQLTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class MySQLTest {
4848
@Container
4949
private static final MySQLContainer mysql =
5050
new MySQLContainer(TestContainersConfiguration.MYSQL_LATEST)
51+
.withUrlParam("openTelemetry", "DISABLED")
5152
.withInitScript("examples/mariadb/CreateDB.sql");
5253

5354
private SqlSessionFactory sqlSessionFactory;

‎src/test/kotlin/examples/kotlin/spring/canonical/InfixElementsTest.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ open class InfixElementsTest {
12701270
fun search(vararg names: String) {
12711271
val selectStatement = select(firstName) {
12721272
from(person)
1273-
where { firstName isIn names }
1273+
where { firstName isIn names.asList() }
12741274
orderBy(id)
12751275
}
12761276

@@ -1291,7 +1291,7 @@ open class InfixElementsTest {
12911291
fun search(vararg names: String?) {
12921292
val selectStatement = select(firstName) {
12931293
from(person)
1294-
where { firstName isInWhenPresent names }
1294+
where { firstName isInWhenPresent names.asList() }
12951295
orderBy(id)
12961296
}
12971297

@@ -1313,7 +1313,7 @@ open class InfixElementsTest {
13131313
from(person)
13141314
where {
13151315
id isLessThan 10
1316-
and { firstName isInWhenPresent null as Array<String>? }
1316+
and { firstName isInWhenPresent null as List<String>? }
13171317
}
13181318
orderBy(id)
13191319
}
@@ -1332,7 +1332,7 @@ open class InfixElementsTest {
13321332
fun search(vararg names: String) {
13331333
val selectStatement = select(firstName) {
13341334
from(person)
1335-
where { firstName isNotIn names }
1335+
where { firstName isNotIn names.asList() }
13361336
orderBy(id)
13371337
}
13381338

@@ -1353,7 +1353,7 @@ open class InfixElementsTest {
13531353
fun search(vararg names: String?) {
13541354
val selectStatement = select(firstName) {
13551355
from(person)
1356-
where { firstName isNotInWhenPresent names }
1356+
where { firstName isNotInWhenPresent names.asList() }
13571357
orderBy(id)
13581358
}
13591359

@@ -1375,7 +1375,7 @@ open class InfixElementsTest {
13751375
from(person)
13761376
where {
13771377
id isLessThan 10
1378-
and { firstName isNotInWhenPresent null as Array<String>? }
1378+
and { firstName isNotInWhenPresent null as List<String>? }
13791379
}
13801380
orderBy(id)
13811381
}
@@ -1394,7 +1394,7 @@ open class InfixElementsTest {
13941394
fun search(vararg names: String) {
13951395
val selectStatement = select(firstName) {
13961396
from(person)
1397-
where { firstName isInCaseInsensitive names }
1397+
where { firstName isInCaseInsensitive names.asList() }
13981398
orderBy(id)
13991399
}
14001400

@@ -1415,7 +1415,7 @@ open class InfixElementsTest {
14151415
fun search(vararg names: String?) {
14161416
val selectStatement = select(firstName) {
14171417
from(person)
1418-
where { firstName isInCaseInsensitiveWhenPresent names }
1418+
where { firstName isInCaseInsensitiveWhenPresent names.asList() }
14191419
orderBy(id)
14201420
}
14211421

@@ -1437,7 +1437,7 @@ open class InfixElementsTest {
14371437
from(person)
14381438
where {
14391439
id isLessThan 10
1440-
and { firstName isInCaseInsensitiveWhenPresent null as Array<String>? }
1440+
and { firstName isInCaseInsensitiveWhenPresent null as List<String>? }
14411441
}
14421442
orderBy(id)
14431443
}
@@ -1456,7 +1456,7 @@ open class InfixElementsTest {
14561456
fun search(vararg names: String) {
14571457
val selectStatement = select(firstName) {
14581458
from(person)
1459-
where { firstName isNotInCaseInsensitive names }
1459+
where { firstName isNotInCaseInsensitive names.asList() }
14601460
orderBy(id)
14611461
}
14621462

@@ -1477,7 +1477,7 @@ open class InfixElementsTest {
14771477
fun search(vararg names: String?) {
14781478
val selectStatement = select(firstName) {
14791479
from(person)
1480-
where { firstName isNotInCaseInsensitiveWhenPresent names }
1480+
where { firstName isNotInCaseInsensitiveWhenPresent names.asList() }
14811481
orderBy(id)
14821482
}
14831483

@@ -1499,7 +1499,7 @@ open class InfixElementsTest {
14991499
from(person)
15001500
where {
15011501
id isLessThan 10
1502-
and { firstName isNotInCaseInsensitiveWhenPresent null as Array<String>? }
1502+
and { firstName isNotInCaseInsensitiveWhenPresent null as List<String>? }
15031503
}
15041504
orderBy(id)
15051505
}

0 commit comments

Comments
 (0)