From 67676880f7ab4a07e4cc0b4e9ec603c3d761a950 Mon Sep 17 00:00:00 2001 From: Piotr Kubowicz Date: Mon, 29 Dec 2025 23:30:42 +0100 Subject: [PATCH 1/3] [kotlin] Add integration test for query params This is a test for a regression from #22512 where param values were written as a list. --- .../build.gradle | 1 + .../openapitools/integration/PetApiTest.kt | 35 +++++++++++++++++++ .../openapitools/integration/UserApiTest.kt | 35 +++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt create mode 100644 samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle b/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle index 87885e16cbe2..f46b04c5bda3 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle @@ -66,6 +66,7 @@ dependencies { implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0" implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt new file mode 100644 index 000000000000..29cf3c9d223b --- /dev/null +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt @@ -0,0 +1,35 @@ +package org.openapitools.integration + +import io.kotlintest.matchers.collections.shouldHaveSize +import io.kotlintest.specs.ShouldSpec +import org.openapitools.client.apis.PetApi +import org.springframework.boot.test.web.client.MockServerRestClientCustomizer +import org.springframework.http.HttpMethod +import org.springframework.http.MediaType.APPLICATION_JSON +import org.springframework.test.web.client.match.MockRestRequestMatchers.method +import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo +import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess +import org.springframework.web.client.RestClient + +class PetApiTest : ShouldSpec() { + init { + should("find by status passing a query parameter with a list of values") { + val restClientBuilder: RestClient.Builder = RestClient.builder() + val mockServer = MockServerRestClientCustomizer().let { + it.customize(restClientBuilder) + it.getServer(restClientBuilder) + } + val petApi = PetApi(restClientBuilder.build()) + + mockServer.expect(requestTo("/pet/findByStatus?status=pending,available")) + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("[]", APPLICATION_JSON)) + + val response = petApi.findPetsByStatus(listOf(PetApi.StatusFindPetsByStatus.pending, PetApi.StatusFindPetsByStatus.available)) + + mockServer.verify() + + response shouldHaveSize 0 + } + } +} diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt new file mode 100644 index 000000000000..34d15ceed200 --- /dev/null +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt @@ -0,0 +1,35 @@ +package org.openapitools.integration + +import io.kotlintest.shouldBe +import io.kotlintest.specs.ShouldSpec +import org.openapitools.client.apis.UserApi +import org.springframework.boot.test.web.client.MockServerRestClientCustomizer +import org.springframework.http.HttpMethod +import org.springframework.http.MediaType.TEXT_PLAIN +import org.springframework.test.web.client.match.MockRestRequestMatchers.method +import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo +import org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess +import org.springframework.web.client.RestClient + +class UserApiTest : ShouldSpec() { + init { + should("call login user passing a query parameter with a single value") { + val restClientBuilder: RestClient.Builder = RestClient.builder() + val mockServer = MockServerRestClientCustomizer().let { + it.customize(restClientBuilder) + it.getServer(restClientBuilder) + } + val userApi = UserApi(restClientBuilder.build()) + + mockServer.expect(requestTo("/user/login?username=myUsername&password=myPassword")) + .andExpect(method(HttpMethod.GET)) + .andRespond(withSuccess("login response", TEXT_PLAIN)) + + val response = userApi.loginUser("myUsername", "myPassword") + + mockServer.verify() + + response shouldBe "login response" + } + } +} From 14e836d622c009bd3b9538cc3462fc2e768fc4c6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 14 Jan 2026 15:00:09 +0800 Subject: [PATCH 2/3] add test implementation for kotlin spring client --- .../resources/kotlin-client/build.gradle.mustache | 11 ++++++++--- .../client/echo_api/kotlin-jvm-okhttp/build.gradle | 1 - .../kotlin-jvm-spring-3-restclient/build.gradle | 2 +- .../kotlin-jvm-spring-3-webclient/build.gradle | 3 +-- .../kotlin-model-prefix-type-mappings/build.gradle | 1 - .../client/others/kotlin-integer-enum/build.gradle | 1 - .../kotlin-jvm-okhttp-non-ascii-headers/build.gradle | 1 - .../kotlin-jvm-okhttp-parameter-tests/build.gradle | 1 - .../kotlin-jvm-okhttp-path-comments/build.gradle | 1 - .../build.gradle | 1 - .../build.gradle | 1 - .../petstore/kotlin-allOf-discriminator/build.gradle | 1 - .../petstore/kotlin-array-integer-enum/build.gradle | 1 - .../build.gradle | 1 - .../kotlin-bigdecimal-default-okhttp4/build.gradle | 1 - .../kotlin-default-values-jvm-okhttp4/build.gradle | 1 - .../kotlin-default-values-jvm-retrofit2/build.gradle | 1 - .../petstore/kotlin-enum-default-value/build.gradle | 1 - samples/client/petstore/kotlin-explicit/build.gradle | 1 - samples/client/petstore/kotlin-gson/build.gradle | 1 - samples/client/petstore/kotlin-jackson/build.gradle | 1 - .../petstore/kotlin-json-request-string/build.gradle | 1 - .../client/petstore/kotlin-jvm-jackson/build.gradle | 1 - .../client/petstore/kotlin-jvm-ktor-gson/build.gradle | 1 - .../petstore/kotlin-jvm-ktor-jackson/build.gradle | 1 - .../build.gradle | 1 - .../kotlin-jvm-okhttp4-coroutines/build.gradle | 1 - .../kotlin-jvm-retrofit2-coroutines/build.gradle | 1 - .../kotlin-jvm-spring-2-webclient/build.gradle | 2 +- .../kotlin-jvm-spring-3-restclient/build.gradle | 3 +-- .../kotlin-jvm-spring-3-webclient/build.gradle | 3 +-- .../petstore/kotlin-jvm-vertx-gson/build.gradle | 3 +-- .../kotlin-jvm-vertx-jackson-coroutines/build.gradle | 3 +-- .../petstore/kotlin-jvm-vertx-jackson/build.gradle | 3 +-- .../petstore/kotlin-jvm-vertx-moshi/build.gradle | 3 +-- .../petstore/kotlin-kotlinx-datetime/build.gradle | 1 - .../kotlin-model-prefix-type-mappings/build.gradle | 1 - .../client/petstore/kotlin-modelMutable/build.gradle | 1 - .../client/petstore/kotlin-moshi-codegen/build.gradle | 1 - .../kotlin-name-parameter-mappings/build.gradle | 1 - samples/client/petstore/kotlin-nonpublic/build.gradle | 1 - samples/client/petstore/kotlin-nullable/build.gradle | 1 - .../petstore/kotlin-retrofit2-jackson/build.gradle | 1 - .../build.gradle | 1 - .../client/petstore/kotlin-retrofit2-rx3/build.gradle | 1 - samples/client/petstore/kotlin-retrofit2/build.gradle | 1 - samples/client/petstore/kotlin-string/build.gradle | 1 - .../client/petstore/kotlin-threetenbp/build.gradle | 1 - .../petstore/kotlin-uppercase-enum/build.gradle | 1 - samples/client/petstore/kotlin/build.gradle | 1 - 50 files changed, 17 insertions(+), 59 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache index 07c0dc3c6f0a..fba5180ff8da 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache @@ -108,14 +108,16 @@ kotlin { explicitApi() } {{/explicitApi}} -{{#jvm-spring-webclient}}{{#useSpringBoot3}} +{{#jvm-spring-webclient}} +{{#useSpringBoot3}} kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) } } -{{/useSpringBoot3}}{{/jvm-spring-webclient}} +{{/useSpringBoot3}} +{{/jvm-spring-webclient}} {{#jvm-spring-restclient}} kotlin { @@ -219,7 +221,6 @@ dependencies { {{/jackson}} implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion" {{/jvm-retrofit2}} - testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" {{#jvm-vertx}} implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-core:$vertx_version" @@ -229,6 +230,10 @@ dependencies { implementation "io.vertx:vertx-lang-kotlin-coroutines:$vertx_version" {{/useCoroutines}} {{/jvm-vertx}} + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + {{#jvm-spring}} + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" + {{/jvm-spring}} } {{#kotlinx_serialization}} diff --git a/samples/client/echo_api/kotlin-jvm-okhttp/build.gradle b/samples/client/echo_api/kotlin-jvm-okhttp/build.gradle index 33ab0290c5be..82a9a44146e2 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp/build.gradle +++ b/samples/client/echo_api/kotlin-jvm-okhttp/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/build.gradle b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/build.gradle index 670d016f603b..a7556b7889da 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/build.gradle +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) @@ -67,6 +66,7 @@ dependencies { implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0" implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" } java { diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/build.gradle b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/build.gradle index 67615c7c822a..411bf3366960 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/build.gradle +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/build.gradle @@ -53,14 +53,12 @@ test { useJUnitPlatform() } - kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) } } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -69,6 +67,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version" implementation "io.projectreactor:reactor-core:3.7.11" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" } java { diff --git a/samples/client/echo_api/kotlin-model-prefix-type-mappings/build.gradle b/samples/client/echo_api/kotlin-model-prefix-type-mappings/build.gradle index ecdb5bbf6146..87aab3982d7e 100644 --- a/samples/client/echo_api/kotlin-model-prefix-type-mappings/build.gradle +++ b/samples/client/echo_api/kotlin-model-prefix-type-mappings/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" diff --git a/samples/client/others/kotlin-integer-enum/build.gradle b/samples/client/others/kotlin-integer-enum/build.gradle index f1defb388bc8..43186d276d28 100644 --- a/samples/client/others/kotlin-integer-enum/build.gradle +++ b/samples/client/others/kotlin-integer-enum/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/build.gradle b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/build.gradle index 44ea0989c6f9..25c765f063d3 100644 --- a/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/build.gradle +++ b/samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/build.gradle b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/build.gradle index 670a093d544e..2847cfa423cb 100644 --- a/samples/client/others/kotlin-jvm-okhttp-parameter-tests/build.gradle +++ b/samples/client/others/kotlin-jvm-okhttp-parameter-tests/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/others/kotlin-jvm-okhttp-path-comments/build.gradle b/samples/client/others/kotlin-jvm-okhttp-path-comments/build.gradle index bf09ca08bb31..7d2bbdd927ac 100644 --- a/samples/client/others/kotlin-jvm-okhttp-path-comments/build.gradle +++ b/samples/client/others/kotlin-jvm-okhttp-path-comments/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/build.gradle b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/build.gradle index 8e365f15768c..ee4a98a39424 100644 --- a/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/build.gradle +++ b/samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization/build.gradle @@ -55,7 +55,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle index 6845a65db564..4000f0f6a40c 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle @@ -54,7 +54,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin-allOf-discriminator/build.gradle b/samples/client/petstore/kotlin-allOf-discriminator/build.gradle index af2e01e532fe..0b362f456f66 100644 --- a/samples/client/petstore/kotlin-allOf-discriminator/build.gradle +++ b/samples/client/petstore/kotlin-allOf-discriminator/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-array-integer-enum/build.gradle b/samples/client/petstore/kotlin-array-integer-enum/build.gradle index 8a13fe30944b..a9aa6cc1c614 100644 --- a/samples/client/petstore/kotlin-array-integer-enum/build.gradle +++ b/samples/client/petstore/kotlin-array-integer-enum/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle index a2bb55b4f5ae..527ee2a86fa2 100644 --- a/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle +++ b/samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle index c6397314ca5c..8444cb7e2395 100644 --- a/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle +++ b/samples/client/petstore/kotlin-bigdecimal-default-okhttp4/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle index f9925745a4a1..8e53b9733a87 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle +++ b/samples/client/petstore/kotlin-default-values-jvm-okhttp4/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle index b6a7a932275d..e9f18ca12563 100644 --- a/samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-default-values-jvm-retrofit2/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-enum-default-value/build.gradle b/samples/client/petstore/kotlin-enum-default-value/build.gradle index 502b6e86f59e..09f92ed7945c 100644 --- a/samples/client/petstore/kotlin-enum-default-value/build.gradle +++ b/samples/client/petstore/kotlin-enum-default-value/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-explicit/build.gradle b/samples/client/petstore/kotlin-explicit/build.gradle index b62447600a8c..6fcf9dfecafe 100644 --- a/samples/client/petstore/kotlin-explicit/build.gradle +++ b/samples/client/petstore/kotlin-explicit/build.gradle @@ -56,7 +56,6 @@ kotlin { explicitApi() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-gson/build.gradle b/samples/client/petstore/kotlin-gson/build.gradle index d8dcc2495808..37b6c1ee3799 100644 --- a/samples/client/petstore/kotlin-gson/build.gradle +++ b/samples/client/petstore/kotlin-gson/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "com.google.code.gson:gson:2.13.2" diff --git a/samples/client/petstore/kotlin-jackson/build.gradle b/samples/client/petstore/kotlin-jackson/build.gradle index 87a2ca457175..24fefb5e7397 100644 --- a/samples/client/petstore/kotlin-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jackson/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-json-request-string/build.gradle b/samples/client/petstore/kotlin-json-request-string/build.gradle index 52daf2d90f78..d85309d8a7d5 100644 --- a/samples/client/petstore/kotlin-json-request-string/build.gradle +++ b/samples/client/petstore/kotlin-json-request-string/build.gradle @@ -55,7 +55,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin-jvm-jackson/build.gradle b/samples/client/petstore/kotlin-jvm-jackson/build.gradle index fdae892843c3..cf247cb1a9de 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-jackson/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle index eeea798749bd..4abf27a69022 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-gson/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "com.google.code.gson:gson:2.13.2" diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle index 655dc49c5300..79a48403dba3 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle index 3f299cc9d065..4617c1ff1a7d 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle +++ b/samples/client/petstore/kotlin-jvm-ktor-kotlinx_serialization/build.gradle @@ -55,7 +55,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle index 019646c7914c..56e86b4d1e54 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" diff --git a/samples/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle index 29eadce6f0e0..b0e4d9aa5bd2 100644 --- a/samples/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-retrofit2-coroutines/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/build.gradle b/samples/client/petstore/kotlin-jvm-spring-2-webclient/build.gradle index e5e9ff7176fd..aa9fe27f3086 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/build.gradle +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -62,6 +61,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version" implementation "io.projectreactor:reactor-core:3.7.11" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" } java { diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle b/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle index f46b04c5bda3..f0a0abec209c 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) @@ -66,8 +65,8 @@ dependencies { implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0" implementation "org.springframework.boot:spring-boot-starter-web:$spring_boot_version" - testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" } java { diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/build.gradle b/samples/client/petstore/kotlin-jvm-spring-3-webclient/build.gradle index 6110117177d3..5d4c9f90412a 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/build.gradle +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/build.gradle @@ -53,14 +53,12 @@ test { useJUnitPlatform() } - kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) } } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -69,6 +67,7 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version" implementation "io.projectreactor:reactor-core:3.7.11" testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" + testImplementation "org.springframework.boot:spring-boot-test:$spring_boot_version" } java { diff --git a/samples/client/petstore/kotlin-jvm-vertx-gson/build.gradle b/samples/client/petstore/kotlin-jvm-vertx-gson/build.gradle index b5c9af0e34f1..55108dd32580 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-gson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-vertx-gson/build.gradle @@ -53,15 +53,14 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "com.google.code.gson:gson:2.13.2" - testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-core:$vertx_version" implementation "io.vertx:vertx-lang-kotlin:$vertx_version" implementation "io.vertx:vertx-uri-template:$vertx_version" + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } java { diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/build.gradle b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/build.gradle index 94d506637a95..0687715531e6 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/build.gradle +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/build.gradle @@ -53,19 +53,18 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0" - testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-core:$vertx_version" implementation "io.vertx:vertx-lang-kotlin:$vertx_version" implementation "io.vertx:vertx-uri-template:$vertx_version" implementation "io.vertx:vertx-lang-kotlin-coroutines:$vertx_version" + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } java { diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/build.gradle b/samples/client/petstore/kotlin-jvm-vertx-jackson/build.gradle index b3311a13d739..799cbbfde897 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/build.gradle +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/build.gradle @@ -53,17 +53,16 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.20.0" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.0" - testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-core:$vertx_version" implementation "io.vertx:vertx-lang-kotlin:$vertx_version" implementation "io.vertx:vertx-uri-template:$vertx_version" + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } java { diff --git a/samples/client/petstore/kotlin-jvm-vertx-moshi/build.gradle b/samples/client/petstore/kotlin-jvm-vertx-moshi/build.gradle index 0e047892da3f..178f401657fe 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-moshi/build.gradle +++ b/samples/client/petstore/kotlin-jvm-vertx-moshi/build.gradle @@ -53,17 +53,16 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "com.squareup.moshi:moshi-kotlin:1.15.2" implementation "com.squareup.moshi:moshi-adapters:1.15.2" - testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" implementation "io.vertx:vertx-web-client:$vertx_version" implementation "io.vertx:vertx-core:$vertx_version" implementation "io.vertx:vertx-lang-kotlin:$vertx_version" implementation "io.vertx:vertx-uri-template:$vertx_version" + testImplementation "io.kotlintest:kotlintest-runner-junit5:3.4.2" } java { diff --git a/samples/client/petstore/kotlin-kotlinx-datetime/build.gradle b/samples/client/petstore/kotlin-kotlinx-datetime/build.gradle index 629195dc90fe..b284de639cf5 100644 --- a/samples/client/petstore/kotlin-kotlinx-datetime/build.gradle +++ b/samples/client/petstore/kotlin-kotlinx-datetime/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - kotlin { sourceSets { all { diff --git a/samples/client/petstore/kotlin-model-prefix-type-mappings/build.gradle b/samples/client/petstore/kotlin-model-prefix-type-mappings/build.gradle index 63655dbf2ac1..ada67478462c 100644 --- a/samples/client/petstore/kotlin-model-prefix-type-mappings/build.gradle +++ b/samples/client/petstore/kotlin-model-prefix-type-mappings/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2" diff --git a/samples/client/petstore/kotlin-modelMutable/build.gradle b/samples/client/petstore/kotlin-modelMutable/build.gradle index 7a33fdef4843..e19f50a48194 100644 --- a/samples/client/petstore/kotlin-modelMutable/build.gradle +++ b/samples/client/petstore/kotlin-modelMutable/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-moshi-codegen/build.gradle b/samples/client/petstore/kotlin-moshi-codegen/build.gradle index e967dfc6b140..1c97687c77da 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/build.gradle +++ b/samples/client/petstore/kotlin-moshi-codegen/build.gradle @@ -54,7 +54,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "com.squareup.moshi:moshi:1.15.2" diff --git a/samples/client/petstore/kotlin-name-parameter-mappings/build.gradle b/samples/client/petstore/kotlin-name-parameter-mappings/build.gradle index 3cdea1fd6f88..1737ce9d75f9 100644 --- a/samples/client/petstore/kotlin-name-parameter-mappings/build.gradle +++ b/samples/client/petstore/kotlin-name-parameter-mappings/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-nonpublic/build.gradle b/samples/client/petstore/kotlin-nonpublic/build.gradle index c00d3770f925..82faba1bbb15 100644 --- a/samples/client/petstore/kotlin-nonpublic/build.gradle +++ b/samples/client/petstore/kotlin-nonpublic/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-nullable/build.gradle b/samples/client/petstore/kotlin-nullable/build.gradle index 488d4a1ffd8e..f480f15c9177 100644 --- a/samples/client/petstore/kotlin-nullable/build.gradle +++ b/samples/client/petstore/kotlin-nullable/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/build.gradle b/samples/client/petstore/kotlin-retrofit2-jackson/build.gradle index 1e9dbc985ee0..91d9340d0b44 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-jackson/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle index d060790be1bf..d3e6cf89c975 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/build.gradle @@ -55,7 +55,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle index 02f2d845752a..060049a04be3 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2-rx3/build.gradle @@ -54,7 +54,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-retrofit2/build.gradle b/samples/client/petstore/kotlin-retrofit2/build.gradle index 3cb6da546315..1c197c82b154 100644 --- a/samples/client/petstore/kotlin-retrofit2/build.gradle +++ b/samples/client/petstore/kotlin-retrofit2/build.gradle @@ -53,7 +53,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-string/build.gradle b/samples/client/petstore/kotlin-string/build.gradle index 43f72cd44210..96bc60552175 100644 --- a/samples/client/petstore/kotlin-string/build.gradle +++ b/samples/client/petstore/kotlin-string/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-threetenbp/build.gradle b/samples/client/petstore/kotlin-threetenbp/build.gradle index 934080422806..9a2a90697b7d 100644 --- a/samples/client/petstore/kotlin-threetenbp/build.gradle +++ b/samples/client/petstore/kotlin-threetenbp/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/client/petstore/kotlin-uppercase-enum/build.gradle b/samples/client/petstore/kotlin-uppercase-enum/build.gradle index 76a865ed59e1..69d0c7561c47 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/build.gradle +++ b/samples/client/petstore/kotlin-uppercase-enum/build.gradle @@ -54,7 +54,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" diff --git a/samples/client/petstore/kotlin/build.gradle b/samples/client/petstore/kotlin/build.gradle index 3cdea1fd6f88..1737ce9d75f9 100644 --- a/samples/client/petstore/kotlin/build.gradle +++ b/samples/client/petstore/kotlin/build.gradle @@ -52,7 +52,6 @@ test { useJUnitPlatform() } - dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" From e8c422adb5290f2eb2f5f1ec75cecff10a1d423a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 14 Jan 2026 15:03:28 +0800 Subject: [PATCH 3/3] add sha tests --- bin/utils/test_file_list.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml index fbabb57e270e..3412fcdca713 100644 --- a/bin/utils/test_file_list.yaml +++ b/bin/utils/test_file_list.yaml @@ -62,3 +62,7 @@ sha256: b2093528aac971193f2863a70f46eea45cf8bda79120b133a614599e80d8b46d - filename: "samples/server/petstore/rust-axum/output/openapi-v3/tests/oneof_untagged.rs" sha256: 1d3fb01f65e98290b1d3eece28014c7d3e3f2fdf18e7110249d3c591cc4642ab +- filename: "samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/PetApiTest.kt" + sha256: 82a6be39c1ed3dada96dfa1833a6709834cb3f9f9d50a19cbd9d49699e46df4f +- filename: "samples/client/petstore/kotlin-jvm-spring-3-restclient/src/test/kotlin/org/openapitools/integration/UserApiTest.kt" + sha256: bc64fb94857a3598e1332f1278307c3078ea9ec4b4aa75690e6eda86e9729a8d