Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8788747

Browse files
Remove Kotlin Array-Based Functions
The newer Kotlin compiler versions have difficulty distinguishing these methods from the similarly named vararg methods. I don't think they are in wide use - there were only a few tests that used them, and those tests were easily modified.
1 parent fe873ee commit 8788747

File tree

3 files changed

+11
-67
lines changed

3 files changed

+11
-67
lines changed

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

Lines changed: 1 addition & 29 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

@@ -352,7 +340,7 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
352340

353341
@JvmName("isNotInArrayWhenPresent")
354342
infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Array<out T?>?) =
355-
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))
343+
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values?.asList()))
356344

357345
infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Collection<T?>?) =
358346
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))
@@ -410,40 +398,24 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {
410398

411399
fun BindableColumn<String>.isInCaseInsensitive(vararg values: String) = isInCaseInsensitive(values.asList())
412400

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-
417401
infix fun BindableColumn<String>.isInCaseInsensitive(values: Collection<String>) =
418402
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitive(values))
419403

420404
fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(vararg values: String?) =
421405
isInCaseInsensitiveWhenPresent(values.asList())
422406

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-
427407
infix fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
428408
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitiveWhenPresent(values))
429409

430410
fun BindableColumn<String>.isNotInCaseInsensitive(vararg values: String) =
431411
isNotInCaseInsensitive(values.asList())
432412

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-
437413
infix fun BindableColumn<String>.isNotInCaseInsensitive(values: Collection<String>) =
438414
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitive(values))
439415

440416
fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(vararg values: String?) =
441417
isNotInCaseInsensitiveWhenPresent(values.asList())
442418

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-
447419
infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
448420
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))
449421

‎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/kotlin/examples/kotlin/spring/canonical/InfixElementsTest.kt‎

Lines changed: 10 additions & 10 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

@@ -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)

AltStyle によって変換されたページ (->オリジナル) /