Skip to content

Fix kotlin compile problem #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2025
Merged

Fix kotlin compile problem #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8788747
Remove Kotlin Array-Based Functions
jeffgbutler Nov 4, 2025
9612b18
Disable OpenTelemetry in the MySQL Container
jeffgbutler Nov 4, 2025
b22ef5a
Update Kotlin Complier version
jeffgbutler Nov 4, 2025
176ebf2
Remove another array-based function
jeffgbutler Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

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

<kotlin.version>2.1.21</kotlin.version>
<kotlin.version>2.2.21</kotlin.version>
<kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
<kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
<kotlin.compiler.apiVersion>2.0</kotlin.compiler.apiVersion>
Expand All @@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
<scope>provided</scope>
<optional>true</optional>
Expand Down
32 changes: 0 additions & 32 deletions src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/GroupingCriteriaCollector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,6 @@ open class GroupingCriteriaCollector : SubCriteriaCollector() {

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

@JvmName("isInArray")
infix fun <T : Any> BindableColumn<T>.isIn(values: Array<out T>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isIn(values))

infix fun <T : Any> BindableColumn<T>.isIn(values: Collection<T>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isIn(values))

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

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

@JvmName("isInArrayWhenPresent")
infix fun <T : Any> BindableColumn<T>.isInWhenPresent(values: Array<out T?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInWhenPresent(values))

infix fun <T : Any> BindableColumn<T>.isInWhenPresent(values: Collection<T?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInWhenPresent(values))

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

@JvmName("isNotInArray")
infix fun <T : Any> BindableColumn<T>.isNotIn(values: Array<out T>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotIn(values))

infix fun <T : Any> BindableColumn<T>.isNotIn(values: Collection<T>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotIn(values))

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

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

@JvmName("isNotInArrayWhenPresent")
infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Array<out T?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))

infix fun <T : Any> BindableColumn<T>.isNotInWhenPresent(values: Collection<T?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInWhenPresent(values))

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

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

@JvmName("isInArrayCaseInsensitive")
infix fun BindableColumn<String>.isInCaseInsensitive(values: Array<out String>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitive(values))

infix fun BindableColumn<String>.isInCaseInsensitive(values: Collection<String>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitive(values))

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

@JvmName("isInArrayCaseInsensitiveWhenPresent")
infix fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(values: Array<out String?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitiveWhenPresent(values))

infix fun BindableColumn<String>.isInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isInCaseInsensitiveWhenPresent(values))

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

@JvmName("isNotInArrayCaseInsensitive")
infix fun BindableColumn<String>.isNotInCaseInsensitive(values: Array<out String>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitive(values))

infix fun BindableColumn<String>.isNotInCaseInsensitive(values: Collection<String>) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitive(values))

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

@JvmName("isNotInArrayCaseInsensitiveWhenPresent")
infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Array<out String?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))

infix fun BindableColumn<String>.isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?) =
invoke(org.mybatis.dynamic.sql.util.kotlin.elements.isNotInCaseInsensitiveWhenPresent(values))

Expand Down
28 changes: 0 additions & 28 deletions src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/elements/SqlElements.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,36 +286,24 @@ fun <T : Any> isLessThanOrEqualToWhenPresent(value: T?): IsLessThanOrEqualToWhen

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

@JvmName("isInArray")
fun <T : Any> isIn(values: Array<out T>): IsIn<T> = SqlBuilder.isIn(values.asList())

fun <T : Any> isIn(values: Collection<T>): IsIn<T> = SqlBuilder.isIn(values)

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

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

@JvmName("isInArrayWhenPresent")
fun <T : Any> isInWhenPresent(values: Array<out T?>?): IsInWhenPresent<T> = SqlBuilder.isInWhenPresent(values?.asList())

fun <T : Any> isInWhenPresent(values: Collection<T?>?): IsInWhenPresent<T> = SqlBuilder.isInWhenPresent(values)

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

@JvmName("isNotInArray")
fun <T : Any> isNotIn(values: Array<out T>): IsNotIn<T> = SqlBuilder.isNotIn(values.asList())

fun <T : Any> isNotIn(values: Collection<T>): IsNotIn<T> = SqlBuilder.isNotIn(values)

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

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

@JvmName("isNotInArrayWhenPresent")
fun <T : Any> isNotInWhenPresent(values: Array<out T?>?): IsNotInWhenPresent<T> = SqlBuilder.isNotInWhenPresent(values?.asList())

fun <T : Any> isNotInWhenPresent(values: Collection<T?>?): IsNotInWhenPresent<T> = SqlBuilder.isNotInWhenPresent(values)

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

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

@JvmName("isInArrayCaseInsensitive")
fun isInCaseInsensitive(values: Array<out String>): IsInCaseInsensitive<String> =
SqlBuilder.isInCaseInsensitive(values.asList())

fun isInCaseInsensitive(values: Collection<String>): IsInCaseInsensitive<String> =
SqlBuilder.isInCaseInsensitive(values)

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

@JvmName("isInArrayCaseInsensitiveWhenPresent")
fun isInCaseInsensitiveWhenPresent(values: Array<out String?>?): IsInCaseInsensitiveWhenPresent<String> =
SqlBuilder.isInCaseInsensitiveWhenPresent(values?.asList())

fun isInCaseInsensitiveWhenPresent(values: Collection<String?>?): IsInCaseInsensitiveWhenPresent<String> =
SqlBuilder.isInCaseInsensitiveWhenPresent(values)

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

@JvmName("isNotInArrayCaseInsensitive")
fun isNotInCaseInsensitive(values: Array<out String>): IsNotInCaseInsensitive<String> =
SqlBuilder.isNotInCaseInsensitive(values.asList())

fun isNotInCaseInsensitive(values: Collection<String>): IsNotInCaseInsensitive<String> =
SqlBuilder.isNotInCaseInsensitive(values)

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

@JvmName("isNotInArrayCaseInsensitiveWhenPresent")
fun isNotInCaseInsensitiveWhenPresent(values: Array<out String?>?): IsNotInCaseInsensitiveWhenPresent<String> =
SqlBuilder.isNotInCaseInsensitiveWhenPresent(values?.asList())

fun isNotInCaseInsensitiveWhenPresent(values: Collection<String?>?): IsNotInCaseInsensitiveWhenPresent<String> =
SqlBuilder.isNotInCaseInsensitiveWhenPresent(values)

Expand Down
1 change: 1 addition & 0 deletions src/test/java/examples/mysql/MySQLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class MySQLTest {
@Container
private static final MySQLContainer mysql =
new MySQLContainer(TestContainersConfiguration.MYSQL_LATEST)
.withUrlParam("openTelemetry", "DISABLED")
.withInitScript("examples/mariadb/CreateDB.sql");

private SqlSessionFactory sqlSessionFactory;
Expand Down
24 changes: 12 additions & 12 deletions src/test/kotlin/examples/kotlin/spring/canonical/InfixElementsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ open class InfixElementsTest {
fun search(vararg names: String) {
val selectStatement = select(firstName) {
from(person)
where { firstName isIn names }
where { firstName isIn names.asList() }
orderBy(id)
}

Expand All @@ -1291,7 +1291,7 @@ open class InfixElementsTest {
fun search(vararg names: String?) {
val selectStatement = select(firstName) {
from(person)
where { firstName isInWhenPresent names }
where { firstName isInWhenPresent names.asList() }
orderBy(id)
}

Expand All @@ -1313,7 +1313,7 @@ open class InfixElementsTest {
from(person)
where {
id isLessThan 10
and { firstName isInWhenPresent null as Array<String>? }
and { firstName isInWhenPresent null as List<String>? }
}
orderBy(id)
}
Expand All @@ -1332,7 +1332,7 @@ open class InfixElementsTest {
fun search(vararg names: String) {
val selectStatement = select(firstName) {
from(person)
where { firstName isNotIn names }
where { firstName isNotIn names.asList() }
orderBy(id)
}

Expand All @@ -1353,7 +1353,7 @@ open class InfixElementsTest {
fun search(vararg names: String?) {
val selectStatement = select(firstName) {
from(person)
where { firstName isNotInWhenPresent names }
where { firstName isNotInWhenPresent names.asList() }
orderBy(id)
}

Expand All @@ -1375,7 +1375,7 @@ open class InfixElementsTest {
from(person)
where {
id isLessThan 10
and { firstName isNotInWhenPresent null as Array<String>? }
and { firstName isNotInWhenPresent null as List<String>? }
}
orderBy(id)
}
Expand All @@ -1394,7 +1394,7 @@ open class InfixElementsTest {
fun search(vararg names: String) {
val selectStatement = select(firstName) {
from(person)
where { firstName isInCaseInsensitive names }
where { firstName isInCaseInsensitive names.asList() }
orderBy(id)
}

Expand All @@ -1415,7 +1415,7 @@ open class InfixElementsTest {
fun search(vararg names: String?) {
val selectStatement = select(firstName) {
from(person)
where { firstName isInCaseInsensitiveWhenPresent names }
where { firstName isInCaseInsensitiveWhenPresent names.asList() }
orderBy(id)
}

Expand All @@ -1437,7 +1437,7 @@ open class InfixElementsTest {
from(person)
where {
id isLessThan 10
and { firstName isInCaseInsensitiveWhenPresent null as Array<String>? }
and { firstName isInCaseInsensitiveWhenPresent null as List<String>? }
}
orderBy(id)
}
Expand All @@ -1456,7 +1456,7 @@ open class InfixElementsTest {
fun search(vararg names: String) {
val selectStatement = select(firstName) {
from(person)
where { firstName isNotInCaseInsensitive names }
where { firstName isNotInCaseInsensitive names.asList() }
orderBy(id)
}

Expand All @@ -1477,7 +1477,7 @@ open class InfixElementsTest {
fun search(vararg names: String?) {
val selectStatement = select(firstName) {
from(person)
where { firstName isNotInCaseInsensitiveWhenPresent names }
where { firstName isNotInCaseInsensitiveWhenPresent names.asList() }
orderBy(id)
}

Expand All @@ -1499,7 +1499,7 @@ open class InfixElementsTest {
from(person)
where {
id isLessThan 10
and { firstName isNotInCaseInsensitiveWhenPresent null as Array<String>? }
and { firstName isNotInCaseInsensitiveWhenPresent null as List<String>? }
}
orderBy(id)
}
Expand Down