diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index c7e53a7cf8..eaf6cd2307 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -73,7 +73,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen public static final String BEAN_QUALIFIERS = "beanQualifiers"; public static final String USE_JAKARTA_EE = "useJakartaEe"; - public static final String SPRING_BOOT_3 = "SpringBoot3"; + public static final String SPRING_BOOT_3 = "useSpringBoot3"; private String basePackage; private String invokerPackage; diff --git a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts index 2eba4d51c6..845c13cc4e 100644 --- a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts @@ -1,49 +1,42 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.6.7") - } -} - group = "org.openapitools" version = "1.0.0" +java.sourceCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() + maven { url = uri("https://repo.spring.io/milestone") } } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } plugins { - val kotlinVersion = "1.6.21" + val kotlinVersion = "1.7.10" id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "2.6.7" - id("io.spring.dependency-management") version "1.0.11.RELEASE" + id("org.springframework.boot") version "3.0.2" + id("io.spring.dependency-management") version "1.0.14.RELEASE" } dependencies { - compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - compile("org.jetbrains.kotlin:kotlin-reflect") - compile("org.springframework.boot:spring-boot-starter-web") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.springframework.boot:spring-boot-starter-web") - compile("com.google.code.findbugs:jsr305:3.0.2") - compile("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") - compile("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") - compile("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - compile("com.fasterxml.jackson.module:jackson-module-kotlin") - compile("jakarta.validation:jakarta.validation-api") - compile("jakarta.annotation:jakarta.annotation-api:2.1.0") + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") + implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("jakarta.validation:jakarta.validation-api") + implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") - testCompile("org.jetbrains.kotlin:kotlin-test-junit5") - testCompile("org.springframework.boot:spring-boot-starter-test") { + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testImplementation("org.springframework.boot:spring-boot-starter-test") { exclude(module = "junit") } } diff --git a/samples/server/petstore/kotlin-springboot-3/pom.xml b/samples/server/petstore/kotlin-springboot-3/pom.xml index 79c361092b..862fa9a47b 100644 --- a/samples/server/petstore/kotlin-springboot-3/pom.xml +++ b/samples/server/petstore/kotlin-springboot-3/pom.xml @@ -8,16 +8,29 @@ 3.0.2 2.1.0 - 1.6.21 + 1.7.10 - 1.6.21 + 1.7.10 UTF-8 org.springframework.boot spring-boot-starter-parent - 2.6.7 + 3.0.2 + + + repository.spring.milestone + Spring Milestone Repository + https://repo.spring.io/milestone + + + + + spring-milestones + https://repo.spring.io/milestone + + ${project.basedir}/src/main/kotlin ${project.basedir}/src/test/kotlin @@ -41,7 +54,7 @@ spring - 1.8 + 17 diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/ApiUtil.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/ApiUtil.kt index 88e892d0f4..03344e13b4 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/ApiUtil.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/ApiUtil.kt @@ -2,7 +2,7 @@ package org.openapitools.api import org.springframework.web.context.request.NativeWebRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.http.HttpServletResponse import java.io.IOException object ApiUtil { diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt index 44190af7a0..117161bf65 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/Exceptions.kt @@ -3,8 +3,8 @@ package org.openapitools.api import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.ControllerAdvice import org.springframework.web.bind.annotation.ExceptionHandler -import javax.servlet.http.HttpServletResponse -import javax.validation.ConstraintViolationException +import jakarta.servlet.http.HttpServletResponse +import jakarta.validation.ConstraintViolationException // TODO Extend ApiException for custom exception handling, e.g. the below NotFound exception sealed class ApiException(msg: String, val code: Int) : Exception(msg) diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt index 14276afdd0..30567711a2 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -11,8 +11,8 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt index 565382cd61..954f395ee0 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/StoreApiController.kt @@ -10,8 +10,8 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt index 6f85abe692..bc7c7c6a37 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -10,8 +10,8 @@ import org.springframework.validation.annotation.Validated import org.springframework.web.context.request.NativeWebRequest import org.springframework.beans.factory.annotation.Autowired -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* import kotlin.collections.List import kotlin.collections.Map diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt index 8ede962587..894a0b7ea9 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Category.kt @@ -2,8 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * A category for a pet diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 250cb441d3..72b1c1b91b 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -2,8 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * Describes the result of uploading an image resource diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt index 68536f35df..bb131718d9 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Order.kt @@ -3,8 +3,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * An order for a pets from the pet store diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt index 73bf5cdf02..efca810fbb 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Pet.kt @@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import org.openapitools.model.Category import org.openapitools.model.Tag -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * A pet for sale in the pet store diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt index fdee0a2290..b84684566c 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/Tag.kt @@ -2,8 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * A tag for a pet diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt index a99d304e5a..28faad3e3f 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/model/User.kt @@ -2,8 +2,8 @@ package org.openapitools.model import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty -import javax.validation.constraints.* -import javax.validation.Valid +import jakarta.validation.Valid +import jakarta.validation.constraints.* /** * A User who is purchasing from the pet store