From c7367c2d34e68ec2aedc93729a00cce43bcb9b14 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Wed, 16 Feb 2022 15:09:51 +0800 Subject: [PATCH] [kotlin] add missing import, better code format for kotlin generators (#11619) * add missing import, better code format for kotlin generators * update kotlin workflow * more kotlin tests * better code format * separate kotlin client, server teets * comment out tests --- ...kotlin.yaml => samples-kotlin-client.yaml} | 11 ++-- .github/workflows/samples-kotlin-server.yaml | 54 +++++++++++++++++++ .../languages/AbstractKotlinCodegen.java | 4 +- .../languages/KotlinClientCodegen.java | 14 ++--- .../languages/KotlinSpringServerCodegen.java | 12 ++--- .../languages/KotlinVertxServerCodegen.java | 2 +- .../codegen/languages/KtormSchemaCodegen.java | 4 +- .../beanValidationModel.mustache | 3 +- .../kotlin-spring/beanValidationPath.mustache | 4 +- .../resources/kotlin-spring/model.mustache | 1 + pom.xml | 19 ------- .../kotlin/org/openapitools/model/Category.kt | 1 + .../openapitools/model/ModelApiResponse.kt | 1 + .../kotlin/org/openapitools/model/Order.kt | 1 + .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../main/kotlin/org/openapitools/model/Tag.kt | 1 + .../kotlin/org/openapitools/model/User.kt | 1 + .../kotlin/org/openapitools/model/Category.kt | 1 + .../openapitools/model/ModelApiResponse.kt | 1 + .../kotlin/org/openapitools/model/Order.kt | 1 + .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../main/kotlin/org/openapitools/model/Tag.kt | 1 + .../kotlin/org/openapitools/model/User.kt | 1 + .../kotlin/org/openapitools/model/Category.kt | 1 + .../openapitools/model/ModelApiResponse.kt | 1 + .../kotlin/org/openapitools/model/Order.kt | 1 + .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../main/kotlin/org/openapitools/model/Tag.kt | 1 + .../kotlin/org/openapitools/model/User.kt | 1 + .../kotlin/org/openapitools/model/Category.kt | 1 + .../openapitools/model/ModelApiResponse.kt | 1 + .../kotlin/org/openapitools/model/Order.kt | 1 + .../main/kotlin/org/openapitools/model/Pet.kt | 1 + .../main/kotlin/org/openapitools/model/Tag.kt | 1 + .../kotlin/org/openapitools/model/User.kt | 1 + 35 files changed, 105 insertions(+), 47 deletions(-) rename .github/workflows/{samples-kotlin.yaml => samples-kotlin-client.yaml} (93%) create mode 100644 .github/workflows/samples-kotlin-server.yaml diff --git a/.github/workflows/samples-kotlin.yaml b/.github/workflows/samples-kotlin-client.yaml similarity index 93% rename from .github/workflows/samples-kotlin.yaml rename to .github/workflows/samples-kotlin-client.yaml index ce20f98a346..0c619984632 100644 --- a/.github/workflows/samples-kotlin.yaml +++ b/.github/workflows/samples-kotlin-client.yaml @@ -1,14 +1,10 @@ -name: Samples Kotlin +name: Samples Kotlin cilent on: push: branches: - - master - - '[5-9]+.[0-9]+.x' + - 'samples/client/petstore/kotlin*/**' pull_request: - branches: - - master - - '[5-9]+.[0-9]+.x' paths: - 'samples/client/petstore/kotlin*/**' @@ -17,12 +13,13 @@ env: jobs: build: - name: Build Kotlin + name: Build Kotlin client runs-on: ubuntu-latest strategy: fail-fast: false matrix: sample: + # client - samples/client/petstore/kotlin - samples/client/petstore/kotlin-gson - samples/client/petstore/kotlin-jackson diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml new file mode 100644 index 00000000000..bccd2212ad2 --- /dev/null +++ b/.github/workflows/samples-kotlin-server.yaml @@ -0,0 +1,54 @@ +name: Samples Kotlin server + +on: + push: + branches: + - 'samples/server/petstore/kotlin*/**' + pull_request: + paths: + - 'samples/server/petstore/kotlin*/**' + +env: + GRADLE_VERSION: 6.9 + +jobs: + build: + name: Build Kotlin server + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + sample: + # server + - samples/server/petstore/kotlin-springboot + - samples/server/petstore/kotlin-springboot-modelMutable + - samples/server/petstore/kotlin-springboot-delegate + - samples/server/petstore/kotlin-springboot-reactive + - samples/server/petstore/kotlin-server/ktor + - samples/server/petstore/kotlin-server/jaxrs-spec + - samples/server/petstore/kotlin-server-modelMutable + # no build.gradle file + #- samples/server/petstore/kotlin-vertx-modelMutable + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: 8 + - name: Cache maven dependencies + uses: actions/cache@v2.1.7 + env: + cache-name: maven-repository + with: + path: | + ~/.gradle + key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }} + - name: Install Gradle wrapper + uses: eskatos/gradle-command-action@v2 + with: + gradle-version: ${{ env.GRADLE_VERSION }} + build-root-directory: ${{ matrix.sample }} + arguments: wrapper + - name: Build + working-directory: ${{ matrix.sample }} + run: ./gradlew build -x test diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 0c700f116af..1999d51bce4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -1042,5 +1042,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co } @Override - public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.KOTLIN; } + public GeneratorLanguage generatorLanguage() { + return GeneratorLanguage.KOTLIN; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 097555f3f8a..6e0eea1e484 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -247,7 +247,9 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { return "Generates a Kotlin client."; } - public boolean getGenerateRoomModels() { return generateRoomModels; } + public boolean getGenerateRoomModels() { + return generateRoomModels; + } public void setGenerateRoomModels(Boolean generateRoomModels) { this.generateRoomModels = generateRoomModels; @@ -343,12 +345,10 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { // Set the value to defaults if we haven't overridden if (MULTIPLATFORM.equals(getLibrary())) { setSourceFolder("src/commonMain/kotlin"); - } - else if (JVM_VOLLEY.equals(getLibrary())){ + } else if (JVM_VOLLEY.equals(getLibrary())) { // Android plugin wants it's source in java setSourceFolder("src/main/java"); - } - else { + } else { setSourceFolder(super.sourceFolder); } additionalProperties.put(CodegenConstants.SOURCE_FOLDER, this.sourceFolder); @@ -549,8 +549,8 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen { this.setGenerateRoomModels(convertPropertyToBooleanAndWriteBack(GENERATE_ROOM_MODELS)); // Hide this option behind a property getter and setter in case we need to check it elsewhere if (getGenerateRoomModels()) { - modelTemplateFiles.put("model_room.mustache", "RoomModel.kt"); - supportingFiles.add(new SupportingFile("infrastructure/ITransformForStorage.mustache", infrastructureFolder, "ITransformForStorage.kt")); + modelTemplateFiles.put("model_room.mustache", "RoomModel.kt"); + supportingFiles.add(new SupportingFile("infrastructure/ITransformForStorage.mustache", infrastructureFolder, "ITransformForStorage.kt")); } } else { 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 f771ab38ab3..f9ef3026e60 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 @@ -429,7 +429,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen if (!this.interfaceOnly) { supportingFiles.add(new SupportingFile("application.mustache", resourceFolder, "application.yaml")); supportingFiles.add(new SupportingFile("springBootApplication.mustache", - sanitizeDirectory(sourceFolder + File.separator + basePackage), "Application.kt")); + sanitizeDirectory(sourceFolder + File.separator + basePackage), "Application.kt")); } } @@ -596,11 +596,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen final List allParams = operation.allParams; if (allParams != null) { allParams.forEach(param -> - // This is necessary in case 'modelMutable' is enabled, - // to prevent Spring Request handlers from being generated with - // parameters using their Mutable container types. - // See https://github.com/OpenAPITools/openapi-generator/pull/11154#discussion_r793094727 - param.dataType = getNonMutableContainerTypeIfNeeded(param.dataType)); + // This is necessary in case 'modelMutable' is enabled, + // to prevent Spring Request handlers from being generated with + // parameters using their Mutable container types. + // See https://github.com/OpenAPITools/openapi-generator/pull/11154#discussion_r793094727 + param.dataType = getNonMutableContainerTypeIfNeeded(param.dataType)); } doDataTypeAssignment(operation.returnType, new DataTypeAssigner() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java index 7d50e57b7f0..6445a7018dc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinVertxServerCodegen.java @@ -37,7 +37,7 @@ public class KotlinVertxServerCodegen extends AbstractKotlinCodegen { public static final String PROJECT_NAME = "projectName"; - final Logger LOGGER = LoggerFactory.getLogger(KotlinVertxServerCodegen.class); + final Logger LOGGER = LoggerFactory.getLogger(KotlinVertxServerCodegen.class); public CodegenType getTag() { return CodegenType.SERVER; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java index 73457440d66..b4f1b12081d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java @@ -1228,5 +1228,7 @@ public class KtormSchemaCodegen extends AbstractKotlinCodegen { } @Override - public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.KTORM; } + public GeneratorLanguage generatorLanguage() { + return GeneratorLanguage.KTORM; + } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache index e06238fb17e..996353148d6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationModel.mustache @@ -1,8 +1,7 @@ {{! format: email }}{{#isEmail}} - @get:Email -{{/isEmail}}{{! + @get:Email{{/isEmail}}{{! pattern set }}{{#pattern}} @get:Pattern(regexp="{{{.}}}"){{/pattern}}{{! diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationPath.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationPath.mustache index 7fe8e0c327b..8eb9029b980 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationPath.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/beanValidationPath.mustache @@ -1,6 +1,4 @@ -{{! -format: email -}}{{#isEmail}}@Email {{/isEmail}}{{! +{{#isEmail}}@Email {{/isEmail}}{{! pattern set }}{{#pattern}}@Pattern(regexp="{{{.}}}") {{/pattern}}{{! minLength && maxLength set diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache index 37489b1d560..4dcc67b81b3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache @@ -6,6 +6,7 @@ import java.util.Objects {{#useBeanValidation}} import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/pom.xml b/pom.xml index fb5c330ba43..5b5ed00e243 100644 --- a/pom.xml +++ b/pom.xml @@ -1184,7 +1184,6 @@ samples/server/petstore/jaxrs-resteasy/eap-java8 samples/server/petstore/jaxrs-resteasy/joda samples/server/petstore/jaxrs-resteasy/default-value - samples/client/petstore/spring-cloud samples/openapi3/client/petstore/spring-cloud samples/client/petstore/spring-cloud-date-time @@ -1336,24 +1335,6 @@ samples/client/petstore/erlang-client samples/client/petstore/erlang-proper - samples/client/petstore/kotlin - samples/client/petstore/kotlin-gson - samples/client/petstore/kotlin-jackson - samples/client/petstore/kotlin-json-request-string - samples/client/petstore/kotlin-jvm-okhttp4-coroutines - samples/client/petstore/kotlin-moshi-codegen - samples/client/petstore/kotlin-multiplatform - samples/client/petstore/kotlin-nonpublic - samples/client/petstore/kotlin-nullable - samples/client/petstore/kotlin-okhttp3 - samples/client/petstore/kotlin-retrofit2 - samples/client/petstore/kotlin-retrofit2-rx3 - samples/client/petstore/kotlin-string - samples/client/petstore/kotlin-threetenbp - samples/client/petstore/kotlin-uppercase-enum - - samples/server/petstore/kotlin-springboot - diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt index be587aeaeec..5459864c074 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 6ada956e84e..6b3e10c5694 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 2de2fa35642..c81e062d3f9 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index 6f1084761b2..c37375167f9 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -7,6 +7,7 @@ import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index ab8e8348498..1d540aa1677 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt index c083bd85dba..87e20405d96 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt index 106585ec150..55a87b1bdc5 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Category.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 9916aaf62e3..e1564399e52 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt index 2cfdd429793..8e0ff334563 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Order.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt index a1943cde3f3..40ab9eb34dd 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Pet.kt @@ -7,6 +7,7 @@ import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt index 77fc054dc91..3d93696f37a 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/Tag.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt index 58ba8f5177b..a18ff38ef0e 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/model/User.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt index c76fbbf1e9c..66d8d45d466 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Category.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 6ada956e84e..6b3e10c5694 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt index 2de2fa35642..c81e062d3f9 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Order.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt index 22bbe695c0d..42394bc5a10 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Pet.kt @@ -7,6 +7,7 @@ import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt index ab8e8348498..1d540aa1677 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/Tag.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt index c083bd85dba..87e20405d96 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/model/User.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt index c76fbbf1e9c..66d8d45d466 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 6ada956e84e..6b3e10c5694 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt index 2de2fa35642..c81e062d3f9 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonValue import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt index 22bbe695c0d..42394bc5a10 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt @@ -7,6 +7,7 @@ import org.openapitools.model.Category import org.openapitools.model.Tag import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt index ab8e8348498..1d540aa1677 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt index c083bd85dba..87e20405d96 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt @@ -4,6 +4,7 @@ import java.util.Objects import com.fasterxml.jackson.annotation.JsonProperty import javax.validation.constraints.DecimalMax import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email import javax.validation.constraints.Max import javax.validation.constraints.Min import javax.validation.constraints.NotNull