From f013df091b04898118e2dc35c5ce1dbb33cfbc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Jun 2026 13:35:46 +0200 Subject: [PATCH 1/4] add @param:JsonProperty --- .../kotlin-spring/dataClassOptVar.mustache | 1 + .../kotlin-spring/dataClassReqVar.mustache | 1 + .../src/main/kotlin/org/openapitools/model/Cat.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Bird.kt | 4 ++++ .../main/kotlin/org/openapitools/model/Robobird.kt | 4 ++++ .../src/main/kotlin/org/openapitools/model/Car.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Truck.kt | 2 ++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../kotlin/org/openapitools/model/Annotation.kt | 1 + .../kotlin/org/openapitools/model/AnyOfUserOrPet.kt | 13 +++++++++++++ .../model/AnyOfUserOrPetOrArrayString.kt | 13 +++++++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../src/main/kotlin/org/openapitools/model/Apa.kt | 6 ++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 9 +++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 10 ++++++++++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/ApiError.kt | 2 ++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../model/MultipartMixedRequestMarker.kt | 1 + .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../src/main/kotlin/org/openapitools/model/Order.kt | 2 ++ .../main/kotlin/org/openapitools/model/PageMeta.kt | 4 ++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 3 +++ .../kotlin/org/openapitools/model/SearchResult.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/User.kt | 2 ++ .../main/kotlin/org/openapitools/model/UserList.kt | 2 ++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 3 +++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../main/kotlin/org/openapitools/model/Client.kt | 1 + .../src/main/kotlin/org/openapitools/model/Dog.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Foo.kt | 1 + .../org/openapitools/model/FooGetDefaultResponse.kt | 1 + .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../kotlin/org/openapitools/model/NullableModel.kt | 4 ++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 3 +++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../src/main/kotlin/org/openapitools/model/Cat.kt | 9 +++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/Dog.kt | 10 ++++++++++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ .../main/kotlin/org/openapitools/model/Category.kt | 2 ++ .../org/openapitools/model/ModelApiResponse.kt | 3 +++ .../src/main/kotlin/org/openapitools/model/Order.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Pet.kt | 6 ++++++ .../src/main/kotlin/org/openapitools/model/Tag.kt | 2 ++ .../src/main/kotlin/org/openapitools/model/User.kt | 8 ++++++++ 179 files changed, 787 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache index bee9cfa44c62..3b0c94ced845 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache @@ -6,4 +6,5 @@ @field:JsonInclude(JsonInclude.Include.NON_NULL){{/isNullable}}{{#vendorExtensions.x-has-json-setter-nulls-skip}} @field:JsonSetter(nulls = Nulls.SKIP){{/vendorExtensions.x-has-json-setter-nulls-skip}}{{#vendorExtensions.x-has-json-setter-nulls-fail}} @field:JsonSetter(nulls = Nulls.FAIL){{/vendorExtensions.x-has-json-setter-nulls-fail}} + @param:JsonProperty("{{{baseName}}}") @get:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#vendorExtensions.x-is-jackson-optional-nullable}}JsonNullable<{{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}>{{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}?{{/vendorExtensions.x-is-jackson-optional-nullable}} = {{#vendorExtensions.x-is-jackson-optional-nullable}}JsonNullable.undefined(){{/vendorExtensions.x-is-jackson-optional-nullable}}{{^vendorExtensions.x-is-jackson-optional-nullable}}{{^defaultValue}}null{{/defaultValue}}{{#defaultValue}}{{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}}{{/vendorExtensions.x-is-jackson-optional-nullable}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache index 92e2875ac08a..2f07705c6dd0 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache @@ -2,4 +2,5 @@ @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeInNormalString}}{{{.}}}{{/lambdaEscapeInNormalString}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}}{{#vendorExtensions.x-field-extra-annotation}} {{{.}}}{{/vendorExtensions.x-field-extra-annotation}} + @param:JsonProperty("{{{baseName}}}") @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInPascalCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}} \ No newline at end of file diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt index 045db84aeedc..d5af2e05d658 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Cat.kt @@ -24,9 +24,11 @@ import jakarta.validation.Valid */ data class Cat( + @param:JsonProperty("huntingSkill") @get:JsonProperty("huntingSkill", required = true) val huntingSkill: Cat.HuntingSkill, @field:Valid + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String = "cat" ) : Pet { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt index f6abcb58897d..de31e3c6a74b 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator-const/src/main/kotlin/org/openapitools/model/Dog.kt @@ -25,9 +25,11 @@ import jakarta.validation.Valid data class Dog( @field:Valid + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String = "dog", @get:Min(value=0) + @param:JsonProperty("packSize") @get:JsonProperty("packSize", required = true) val packSize: kotlin.Int = 0 ) : Pet { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt index f4315afc3705..c5611ef934c7 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Bird.kt @@ -27,16 +27,20 @@ import jakarta.validation.Valid */ data class Bird( + @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "BIRD", + @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_BIRD", @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("propertyA") @get:JsonProperty("propertyA") val propertyA: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("sameNameProperty") @get:JsonProperty("sameNameProperty") val sameNameProperty: kotlin.Int? = null ) : Animal, AnotherAnimal { diff --git a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt index 16700f93285b..e11c5a0a1af1 100644 --- a/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt +++ b/samples/server/others/kotlin-springboot/oneOf-discriminator/src/main/kotlin/org/openapitools/model/Robobird.kt @@ -27,16 +27,20 @@ import jakarta.validation.Valid */ data class Robobird( + @param:JsonProperty("discriminator") @get:JsonProperty("discriminator", required = true) override val discriminator: kotlin.String = "ROBOBIRD", + @param:JsonProperty("another_discriminator") @get:JsonProperty("another_discriminator", required = true) override val anotherDiscriminator: kotlin.String = "ANOTHER_ROBOBIRD", @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("propertyB") @get:JsonProperty("propertyB") val propertyB: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("sameNameProperty") @get:JsonProperty("sameNameProperty") val sameNameProperty: kotlin.String? = null ) : Animal, AnotherAnimal { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt index 731b9ea0e007..f4e25930868d 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Car.kt @@ -26,8 +26,10 @@ import jakarta.validation.Valid data class Car( @field:Valid + @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.CAR, + @param:JsonProperty("numDoors") @get:JsonProperty("numDoors", required = true) val numDoors: kotlin.Int ) : Vehicle { diff --git a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt index d53c76f6fc56..61b3bda8c499 100644 --- a/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt +++ b/samples/server/others/kotlin-springboot/oneOf-enum-discriminator/src/main/kotlin/org/openapitools/model/Truck.kt @@ -26,8 +26,10 @@ import jakarta.validation.Valid data class Truck( @field:Valid + @param:JsonProperty("vehicleType") @get:JsonProperty("vehicleType", required = true) override val vehicleType: VehicleType = VehicleType.TRUCK, + @param:JsonProperty("payloadCapacity") @get:JsonProperty("payloadCapacity", required = true) val payloadCapacity: java.math.BigDecimal ) : Vehicle { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt index 346b27b010fd..41a79066f461 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index fea80bf07f56..876981873b0e 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt index 15928412fa8c..c185ea107046 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt index 670dc5f17b3b..978290446045 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,27 +30,33 @@ import javax.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt index 1f632d87106d..cd1a35d618e7 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt index bee865cbd102..12b33d8f20a6 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt index d2f092547146..d7037da8dea0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 69680a903735..684d7c2fa1e8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt index b8097d78c038..858d62c81958 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt index 406061b3774e..1f4269d35cca 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt index 3a13e6f1f0f5..f9a8659d47a8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt index 936be5f4d9bd..251f9ef957fe 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-bean-validation/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt index d2f092547146..d7037da8dea0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 69680a903735..684d7c2fa1e8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt index b8097d78c038..858d62c81958 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt index 406061b3774e..1f4269d35cca 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt index 3a13e6f1f0f5..f9a8659d47a8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt index 936be5f4d9bd..251f9ef957fe 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt index d2f092547146..d7037da8dea0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 69680a903735..684d7c2fa1e8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt index b8097d78c038..858d62c81958 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt index 406061b3774e..1f4269d35cca 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt index 3a13e6f1f0f5..f9a8659d47a8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt index 936be5f4d9bd..251f9ef957fe 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt index d2f092547146..d7037da8dea0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 69680a903735..684d7c2fa1e8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt index b8097d78c038..858d62c81958 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt index 406061b3774e..1f4269d35cca 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt index 3a13e6f1f0f5..f9a8659d47a8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt index 936be5f4d9bd..251f9ef957fe 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt index d2f092547146..d7037da8dea0 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 69680a903735..684d7c2fa1e8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt index b8097d78c038..858d62c81958 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt index 406061b3774e..1f4269d35cca 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt index 3a13e6f1f0f5..f9a8659d47a8 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt index 936be5f4d9bd..251f9ef957fe 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-declarative-interface/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt index 997ffb3e5d89..6277525c4727 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Annotation.kt @@ -25,6 +25,7 @@ data class Annotation( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: java.util.UUID? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt index ed7ecfc57b5e..5344311246f7 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPet.kt @@ -41,65 +41,78 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPet( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: AnyOfUserOrPet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt index 0edca44a3342..60d2f3bc9c93 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/AnyOfUserOrPetOrArrayString.kt @@ -41,65 +41,78 @@ import io.swagger.v3.oas.annotations.media.Schema data class AnyOfUserOrPetOrArrayString( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: AnyOfUserOrPetOrArrayString.Status? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt index 96abacdb65a6..d2e27480217e 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 62f2149be444..13a22509cadb 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt index c671b3153787..fc6ac8284963 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt index cb758490acdf..1a5fa08a8a18 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : UserOrPet, UserOrPetOrArrayString { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt index 1a44a78a0d05..d29f364dcad9 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt index 661454657695..f35223733572 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ import io.swagger.v3.oas.annotations.media.Schema data class User( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("username") @get:JsonProperty("username", required = true) val username: kotlin.String, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : UserOrPet, UserOrPetOrArrayString { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt index 581bab297217..7aac833c5278 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 3bab7deffb0e..2c5456d58b3f 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt index 9dd105064c14..79363b092edf 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,26 +32,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : PlaceOrderResponse, GetOrderByIdResponse { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt index 7566e1d6c13b..0de23f8edb3c 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Pet.kt @@ -33,27 +33,33 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : UpdatePetResponse, AddPetResponse, GetPetByIdResponse { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt index 782d68c93432..87ccccbea017 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt index f608f06a3f33..94fd92baee7c 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/src/main/kotlin/org/openapitools/model/User.kt @@ -31,34 +31,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : GetUserByNameResponse { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt index b0e4794faefe..f44ed4c7ace6 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f458df012389..8d84914db2ba 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt index 368956fddbf0..486848e14599 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt index 8741ad4b1938..56c523367969 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,27 +30,33 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt index 2c44360dc67d..e3ec341838e6 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt index c8005bf5c49a..93294737c422 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { 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 b0e4794faefe..f44ed4c7ace6 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 @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { 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 f458df012389..8d84914db2ba 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 @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { 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 368956fddbf0..486848e14599 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 @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { 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 8741ad4b1938..56c523367969 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 @@ -30,27 +30,33 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { 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 2c44360dc67d..e3ec341838e6 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 @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { 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 c8005bf5c49a..93294737c422 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 @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt index b0e4794faefe..f44ed4c7ace6 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f458df012389..8d84914db2ba 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt index 368956fddbf0..486848e14599 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt index 8741ad4b1938..56c523367969 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,27 +30,33 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt index 2c44360dc67d..e3ec341838e6 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt index c8005bf5c49a..93294737c422 100644 --- a/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-4/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt index b0e4794faefe..f44ed4c7ace6 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f458df012389..8d84914db2ba 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt index 368956fddbf0..486848e14599 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt index 58d7255cb3fd..c076750eb99a 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,27 +30,33 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : kotlin.collections.HashMap(), java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt index 2c44360dc67d..e3ec341838e6 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt index c8005bf5c49a..93294737c422 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt index 916ce85eebba..84a6a84e475a 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/kotlin/org/openapitools/model/Apa.kt @@ -28,26 +28,32 @@ import io.swagger.v3.oas.annotations.media.Schema data class Apa( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("bepa") @get:JsonProperty("bepa", required = true) val bepa: java.math.BigDecimal = java.math.BigDecimal("0"), @Schema(example = "null", required = true, description = "") + @param:JsonProperty("cepa") @get:JsonProperty("cepa", required = true) val cepa: java.math.BigDecimal = java.math.BigDecimal("6.28318"), @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("depa") @get:JsonProperty("depa") val depa: java.math.BigDecimal? = java.math.BigDecimal("71"), @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("epa") @get:JsonProperty("epa") val epa: java.math.BigDecimal? = java.math.BigDecimal("-71"), @Schema(example = "null", description = "") @Deprecated(message = "") + @param:JsonProperty("fepa") @get:JsonProperty("fepa") val fepa: java.math.BigDecimal? = java.math.BigDecimal("100"), @Schema(example = "null", description = "") + @param:JsonProperty("gepa") @get:JsonProperty("gepa") val gepa: java.math.BigDecimal? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt index e5d5accbdc65..2f7b8afcdb54 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index e77f7fcfcaa9..be99a451eed1 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt index 1fc046509656..0744ff2d4e47 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt index 7f87b7fdfdda..e10512ead290 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt index 2ff6a60d3146..6c369ede7d7f 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt index e67a4707fb9f..48c218a96fb5 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { 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 96abacdb65a6..d2e27480217e 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 @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { 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 62f2149be444..13a22509cadb 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 @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { 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 c671b3153787..fc6ac8284963 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 @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { 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 85efde780ca0..1466d9480ad8 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 @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) { 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 1a44a78a0d05..d29f364dcad9 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 @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { 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 f569ada23504..21282c4e3657 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 @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt index 4423010ee3c7..5813f3803e36 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Cat.kt @@ -37,45 +37,54 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: Color? = null ) : Pet, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt index 9673992ec003..c19b9a7c91f4 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,11 +26,13 @@ data class Category( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt index 506bf064f2c7..2a51c2aae5da 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Dog.kt @@ -38,44 +38,54 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) val bark: kotlin.Boolean, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) val breed: Dog.Breed, @ApiModelProperty(example = "null", required = true, value = "Whether the dog enjoys fetching") + @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: Color? = null ) : Pet, com.some.pack.Fetchable, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f671d81fb457..d63275ebef45 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt index cbfa1ea3b39d..f4f0ff415e06 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index fd576418a022..ea787cf41960 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt index 720055637910..e8e3df0043b1 100644 --- a/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt index 59ded438d05d..c7effc69943c 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt +++ b/samples/server/petstore/kotlin-springboot-integer-enum/src/main/kotlin/org/openapitools/model/ApiError.kt @@ -26,11 +26,13 @@ import jakarta.validation.Valid */ data class ApiError( + @param:JsonProperty("errorCode") @get:JsonProperty("errorCode", required = true) val errorCode: ApiError.ErrorCode, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("reasonCode") @get:JsonProperty("reasonCode") val reasonCode: ReasonCode? = null ) { 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 485aafb2a611..cb16f8634846 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 @@ -26,11 +26,13 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") var name: kotlin.String? = null ) : java.io.Serializable { 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 24839f149be9..42d019ca1c28 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 @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") var code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") var type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") var message: kotlin.String? = null ) : java.io.Serializable { 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 1af86070059d..bf17370744c9 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 @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") var petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") var quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") var shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") var status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") var complete: kotlin.Boolean? = false ) : java.io.Serializable { 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 7cdd47f604c4..5acd72ff27ae 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 @@ -32,31 +32,37 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) var name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) var photoUrls: kotlin.collections.MutableList, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") var category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") var tags: kotlin.collections.MutableList? = null, @Schema(example = "null", description = "pet status in the store") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") var status: Pet.Status? = null ) : java.io.Serializable { 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 0db0c5748a8d..666e6d66bf79 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 @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") var name: kotlin.String? = null ) : java.io.Serializable { 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 6f2b9c62684b..71f69c0cc71f 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 @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") var id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") var username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") var firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") var lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") var email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") var password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") var phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") var userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt index c97a9913a6bb..75f1f1798fe3 100644 --- a/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt +++ b/samples/server/petstore/kotlin-springboot-multipart-request-model/src/main/kotlin/org/openapitools/model/MultipartMixedRequestMarker.kt @@ -25,6 +25,7 @@ data class MultipartMixedRequestMarker( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt index f6540be77442..8699b8c6b258 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,10 +24,12 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index fea80bf07f56..876981873b0e 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt index 15928412fa8c..c185ea107046 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt index 563c7704ab70..d5959182a70f 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,26 +30,32 @@ import javax.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt index 1f632d87106d..cd1a35d618e7 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt index bee865cbd102..12b33d8f20a6 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt index f6540be77442..8699b8c6b258 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,10 +24,12 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index fea80bf07f56..876981873b0e 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt index 15928412fa8c..c185ea107046 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Order.kt @@ -30,26 +30,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt index 563c7704ab70..d5959182a70f 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Pet.kt @@ -30,26 +30,32 @@ import javax.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt index 1f632d87106d..cd1a35d618e7 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/Tag.kt @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt index bee865cbd102..12b33d8f20a6 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity/src/main/kotlin/org/openapitools/model/User.kt @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt index 187554e1c993..466b9dbe86a3 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Order.kt @@ -24,10 +24,12 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("amount") @get:JsonProperty("amount") val amount: kotlin.Double? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt index 735f215aba61..d2938312720f 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/PageMeta.kt @@ -21,12 +21,16 @@ import jakarta.validation.Valid */ data class PageMeta( + @param:JsonProperty("size") @get:JsonProperty("size", required = true) val propertySize: kotlin.Long, + @param:JsonProperty("number") @get:JsonProperty("number", required = true) val number: kotlin.Long, + @param:JsonProperty("totalElements") @get:JsonProperty("totalElements", required = true) val totalElements: kotlin.Long, + @param:JsonProperty("totalPages") @get:JsonProperty("totalPages", required = true) val totalPages: kotlin.Long ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt index 58a5118ac2c5..983d1f583f52 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/Pet.kt @@ -23,14 +23,17 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt index c3c130a92cc2..808117dbd28f 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/SearchResult.kt @@ -26,15 +26,18 @@ data class SearchResult( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("query") @get:JsonProperty("query") val query: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("totalHits") @get:JsonProperty("totalHits") val totalHits: kotlin.Int? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("page") @get:JsonProperty("page") val page: PageMeta? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt index 7fa774f6afd4..422da5e76453 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/User.kt @@ -24,10 +24,12 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt index 0c5f1b853735..f65571c55f0f 100644 --- a/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt +++ b/samples/server/petstore/kotlin-springboot-paged-model/src/main/kotlin/org/openapitools/model/UserList.kt @@ -26,10 +26,12 @@ data class UserList( @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("content") @get:JsonProperty("content") val content: kotlin.collections.List? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("description") @get:JsonProperty("description") val description: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt index 96abacdb65a6..d2e27480217e 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 62f2149be444..13a22509cadb 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt index c671b3153787..fc6ac8284963 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt index 85efde780ca0..1466d9480ad8 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt index 1a44a78a0d05..d29f364dcad9 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt index f569ada23504..21282c4e3657 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { 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 96abacdb65a6..d2e27480217e 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 @@ -26,12 +26,14 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @get:Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { 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 62f2149be444..13a22509cadb 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 @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { 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 c671b3153787..fc6ac8284963 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 @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { 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 85efde780ca0..1466d9480ad8 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 @@ -32,32 +32,38 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @Deprecated(message = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) { 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 1a44a78a0d05..d29f364dcad9 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 @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { 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 f569ada23504..21282c4e3657 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 @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt index c73012357ad6..42005c72e1a2 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Cat.kt @@ -26,16 +26,19 @@ import io.swagger.v3.oas.annotations.media.Schema data class Cat( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("declawed") @get:JsonProperty("declawed") val declawed: kotlin.Boolean? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: kotlin.String? = "red" ) : Animal { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt index 18612e61c383..48dcb3cf16a8 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Category.kt @@ -24,11 +24,13 @@ import io.swagger.v3.oas.annotations.media.Schema data class Category( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String = "default-name", @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt index 76b8a5328f2b..2dd5e13e2675 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Client.kt @@ -25,6 +25,7 @@ data class Client( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("client") @get:JsonProperty("client") val client: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt index 76f3a24ede74..4ad2cc5195d3 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Dog.kt @@ -26,16 +26,19 @@ import io.swagger.v3.oas.annotations.media.Schema data class Dog( @Schema(example = "null", required = true, description = "") + @param:JsonProperty("className") @get:JsonProperty("className", required = true) override val className: kotlin.String, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("breed") @get:JsonProperty("breed") val breed: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: kotlin.String? = "red" ) : Animal { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt index a47d21cec152..28f28fb338e4 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Foo.kt @@ -25,6 +25,7 @@ data class Foo( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("bar") @get:JsonProperty("bar") val bar: kotlin.String? = "bar" ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt index d05c267032c4..529d95ebd1d4 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/FooGetDefaultResponse.kt @@ -27,6 +27,7 @@ data class FooGetDefaultResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("string") @get:JsonProperty("string") val string: Foo? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 8b5817dd4b9d..48a6dde613bc 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt index 134694c92f86..f2c26ec7f2d9 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt index 09f827782898..09fe219134cc 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,31 +32,37 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.Set, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt index 280be218dd27..8d1fa8b76543 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt index e758f48a83c7..db579c5c1bf8 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) { diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt index 57ac0506d4ed..c1cfc797b487 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/NullableModel.kt @@ -25,14 +25,18 @@ import jakarta.validation.Valid */ data class NullableModel( + @param:JsonProperty("requiredNonNullable") @get:JsonProperty("requiredNonNullable", required = true) val requiredNonNullable: kotlin.String, + @param:JsonProperty("requiredNullable") @get:JsonProperty("requiredNullable", required = true) val requiredNullable: kotlin.String?, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) + @param:JsonProperty("optionalNonNullable") @get:JsonProperty("optionalNonNullable") val optionalNonNullable: kotlin.String? = null, + @param:JsonProperty("optionalNullable") @get:JsonProperty("optionalNullable") val optionalNullable: JsonNullable = JsonNullable.undefined() ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt index a336e2045aac..11b4702d5b38 100644 --- a/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-sort-validation/src/main/kotlin/org/openapitools/model/Pet.kt @@ -23,14 +23,17 @@ import jakarta.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.FAIL) + @param:JsonProperty("status") @get:JsonProperty("status") val status: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt index ca11e50c2e4c..bdef1620131d 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,11 +26,13 @@ data class Category( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 7dc537866aea..a005c2d0ab49 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt index e63b9f3abfd9..614fab54815b 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt index 07e7c720dfa1..295de4980629 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,31 +32,37 @@ import io.swagger.annotations.ApiModelProperty data class Pet( @ApiModelProperty(example = "doggie", required = true, value = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @ApiModelProperty(example = "null", value = "pet status in the store") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt index 7ddd6b818efd..27cf6521dae4 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt index 758e2f942f87..17040679b5b0 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt index f4506b6a42c7..201f2fccca7b 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,11 +26,13 @@ data class Category( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index 210a5a50b80c..6e5847d70299 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt index 0a5ed61d66bb..df21eb4eb9a7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @Schema(example = "null", description = "Order Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt index 55a124f7e163..3452e53fc80d 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Pet.kt @@ -32,31 +32,37 @@ import io.swagger.v3.oas.annotations.media.Schema data class Pet( @Schema(example = "doggie", required = true, description = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, @Schema(example = "null", required = true, description = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @Schema(example = "null", description = "pet status in the store") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt index f061d0ae5dc8..240d56fd23cc 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt index 84f1c5e8846d..d7a26619ca13 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @Schema(example = "null", description = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @Schema(example = "null", description = "User Status") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt index 4423010ee3c7..5813f3803e36 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt @@ -37,45 +37,54 @@ import io.swagger.annotations.ApiModelProperty data class Cat( @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("hunts") @get:JsonProperty("hunts") val hunts: kotlin.Boolean? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("age") @get:JsonProperty("age") val age: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: Color? = null ) : Pet, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt index edc6bb547afb..0c4476c9698d 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt @@ -26,11 +26,13 @@ data class Category( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") override val name: kotlin.String? = null ) : com.some.pack.CategoryInterface, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt index d1cea67efe9b..9ad790589a79 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt @@ -38,44 +38,54 @@ import io.swagger.annotations.ApiModelProperty data class Dog( @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("bark") @get:JsonProperty("bark", required = true) override val bark: kotlin.Boolean, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("breed") @get:JsonProperty("breed", required = true) override val breed: Dog.Breed, @ApiModelProperty(example = "null", required = true, value = "Whether the dog enjoys fetching") + @param:JsonProperty("likesFetch") @get:JsonProperty("likesFetch", required = true) override val likesFetch: kotlin.Boolean, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("name") @get:JsonProperty("name", required = true) override val name: kotlin.String, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) override val photoUrls: kotlin.collections.List, @ApiModelProperty(example = "null", required = true, value = "") + @param:JsonProperty("petType") @get:JsonProperty("petType", required = true) override val petType: kotlin.String, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") override val id: kotlin.Long? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") override val category: Category? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") override val tags: kotlin.collections.List? = null, @field:Valid @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("color") @get:JsonProperty("color") override val color: Color? = null ) : Pet, com.some.pack.Canine, com.some.pack.Fetchable, java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt index f671d81fb457..d63275ebef45 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt @@ -27,16 +27,19 @@ data class ModelApiResponse( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt index cbfa1ea3b39d..f4f0ff415e06 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt @@ -32,31 +32,37 @@ data class Order( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt index fd576418a022..ea787cf41960 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt @@ -26,11 +26,13 @@ data class Tag( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { diff --git a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt index 720055637910..e8e3df0043b1 100644 --- a/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt +++ b/samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt @@ -32,41 +32,49 @@ data class User( @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @ApiModelProperty(example = "null", value = "") @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { 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 f6540be77442..8699b8c6b258 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 @@ -24,10 +24,12 @@ data class Category( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { 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 fea80bf07f56..876981873b0e 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 @@ -25,14 +25,17 @@ data class ModelApiResponse( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null ) : java.io.Serializable { 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 c2d2ffd380bd..05b5fbbae3f3 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 @@ -31,26 +31,32 @@ data class Order( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false ) : java.io.Serializable { 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 af9db4dc4631..a94d6438c2b5 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 @@ -31,26 +31,32 @@ import javax.validation.Valid */ data class Pet( + @param:JsonProperty("name") @get:JsonProperty("name", required = true) val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls", required = true) val photoUrls: kotlin.collections.List, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, @field:Valid @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null ) : java.io.Serializable { 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 1f632d87106d..cd1a35d618e7 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 @@ -24,10 +24,12 @@ data class Tag( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null ) : java.io.Serializable { 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 bee865cbd102..12b33d8f20a6 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 @@ -30,34 +30,42 @@ data class User( @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, @field:JsonInclude(JsonInclude.Include.NON_NULL) @field:JsonSetter(nulls = Nulls.SKIP) + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null ) : java.io.Serializable { From aa311826c307c589eb280362f202d01d19f449d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Jun 2026 13:59:20 +0200 Subject: [PATCH 2/4] add fix also for kotlin-client and add unit tests --- .../kotlin-client/data_class_opt_var.mustache | 1 + .../kotlin-client/data_class_req_var.mustache | 1 + .../kotlin/KotlinClientCodegenModelTest.java | 47 +++++++++++++++++++ .../spring/KotlinSpringServerCodegenTest.java | 36 ++++++++++++++ .../org/openapitools/client/models/Bird.kt | 2 + .../openapitools/client/models/Category.kt | 2 + .../client/models/DefaultValue.kt | 8 ++++ .../client/models/NumberPropertiesOnly.kt | 3 ++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Query.kt | 2 + .../org/openapitools/client/models/Tag.kt | 2 + ...lodeTrueArrayStringQueryObjectParameter.kt | 1 + .../org/openapitools/client/models/Bird.kt | 2 + .../openapitools/client/models/Category.kt | 2 + .../client/models/DefaultValue.kt | 8 ++++ .../client/models/NumberPropertiesOnly.kt | 3 ++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Query.kt | 2 + .../org/openapitools/client/models/Tag.kt | 2 + ...lodeTrueArrayStringQueryObjectParameter.kt | 1 + .../openapitools/client/models/PingRequest.kt | 1 + .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ .../openapitools/client/models/Category.kt | 2 + .../client/models/ModelApiResponse.kt | 3 ++ .../org/openapitools/client/models/Order.kt | 6 +++ .../org/openapitools/client/models/Pet.kt | 6 +++ .../org/openapitools/client/models/Tag.kt | 2 + .../org/openapitools/client/models/User.kt | 8 ++++ 75 files changed, 381 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache index ab4c5662f84b..6aa77f20d2cb 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache @@ -9,6 +9,7 @@ @SerializedName("{{{vendorExtensions.x-base-name-literal}}}") {{/gson}} {{#jackson}} + @param:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") {{/jackson}} {{#kotlinx_serialization}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache index ebb3444af1f1..10597c040492 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache @@ -9,6 +9,7 @@ @SerializedName("{{{vendorExtensions.x-base-name-literal}}}") {{/gson}} {{#jackson}} + @param:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}") {{/jackson}} {{#kotlinx_serialization}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java index 2f6d0ea4c99f..95bfa644bd4f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java @@ -1037,6 +1037,53 @@ public void testCompanionObjectGeneratesCompanionInModel() throws IOException { TestUtils.assertFileContains(petModel, "companion object { }"); } + @Test(description = "nameMappings: @param:JsonProperty must use the original JSON field name for deserialization") + public void paramJsonPropertyAnnotationWithNameMappings() throws IOException { + // When a property is renamed via nameMappings, @param:JsonProperty must carry the + // original JSON field name so Jackson can deserialize from the correct JSON key. + File output = Files.createTempDirectory("test").toFile(); + output.deleteOnExit(); + + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("kotlin") + .setInputSpec("src/test/resources/3_0/kotlin/param-json-property.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")) + .addAdditionalProperty(CodegenConstants.SERIALIZATION_LIBRARY, "jackson") + .addNameMapping("snake_case_value", "mappedValue"); + + DefaultGenerator generator = new DefaultGenerator(); + generator.opts(configurator.toClientOptInput()).generate(); + + Path itemModel = Paths.get(output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/client/models/Item.kt"); + // @param:JsonProperty must reference the original JSON key, not the mapped Kotlin name + TestUtils.assertFileContains(itemModel, + "@param:JsonProperty(\"snake_case_value\")\n @get:JsonProperty(\"snake_case_value\")\n val mappedValue"); + } + + @Test(description = "auto-renamed digit-starting property: @param:JsonProperty must use the original JSON field name") + public void paramJsonPropertyAnnotationWithDigitStartingPropertyName() throws IOException { + // When a property name starts with a digit, the Kotlin codegen wraps it in backticks + // (e.g. "2nd_field" -> `2ndField`). @param:JsonProperty must still carry the original + // JSON field name so that Jackson can deserialize it correctly. + File output = Files.createTempDirectory("test").toFile(); + output.deleteOnExit(); + + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("kotlin") + .setInputSpec("src/test/resources/3_0/kotlin/param-json-property.yaml") + .setOutputDir(output.getAbsolutePath().replace("\\", "/")) + .addAdditionalProperty(CodegenConstants.SERIALIZATION_LIBRARY, "jackson"); + + DefaultGenerator generator = new DefaultGenerator(); + generator.opts(configurator.toClientOptInput()).generate(); + + Path itemModel = Paths.get(output.getAbsolutePath() + "/src/main/kotlin/org/openapitools/client/models/Item.kt"); + // @param:JsonProperty must reference the original JSON key even when the property + // is auto-renamed to a backtick-escaped identifier + TestUtils.assertFileContains(itemModel, + "@param:JsonProperty(\"2nd_field\")\n @get:JsonProperty(\"2nd_field\")\n val `2ndField`"); + } + private static class ModelNameTest { private final String expectedName; private final String expectedClassName; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 27d8d11af7c8..a6d50082c056 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -6777,4 +6777,40 @@ public void schemaMappingWithNullableAllOfRendersNullableKotlinProperty() throws String content = Files.readString(myObjectFile.toPath()); assertThat(content).contains("com.example.ExternalModel?"); } + + @Test(description = "nameMappings: @param:JsonProperty must use the original JSON field name for deserialization") + public void paramJsonPropertyAnnotationWithNameMappings() throws IOException { + // When a property is renamed via nameMappings, @param:JsonProperty must carry the + // original JSON field name so Jackson can deserialize from the correct JSON key. + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/param-json-property.yaml", + new HashMap<>(), + new HashMap<>(), + configurator -> configurator.addNameMapping("snake_case_value", "mappedValue") + ); + + File itemFile = files.get("Item.kt"); + assertThat(itemFile).isNotNull(); + assertFileContains( + itemFile.toPath(), + "@param:JsonProperty(\"snake_case_value\")\n @get:JsonProperty(\"snake_case_value\", required = true) val mappedValue" + ); + } + + @Test(description = "auto-renamed digit-starting property: @param:JsonProperty must use the original JSON field name") + public void paramJsonPropertyAnnotationWithDigitStartingPropertyName() throws IOException { + // When a property name starts with a digit, the Kotlin codegen wraps it in backticks + // (e.g. "2nd_field" -> `2ndField`). @param:JsonProperty must still carry the original + // JSON field name so that Jackson can deserialize it correctly. + Map files = generateFromContract( + "src/test/resources/3_0/kotlin/param-json-property.yaml" + ); + + File itemFile = files.get("Item.kt"); + assertThat(itemFile).isNotNull(); + assertFileContains( + itemFile.toPath(), + "@param:JsonProperty(\"2nd_field\")\n @get:JsonProperty(\"2nd_field\") val `2ndField`" + ); + } } diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt index 667d8fef1aea..99fc8bc9f08f 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Bird ( + @param:JsonProperty("size") @get:JsonProperty("size") val propertySize: kotlin.String? = null, + @param:JsonProperty("color") @get:JsonProperty("color") val color: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt index 5489682a7c82..3845ce06b70a 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt index a858f72179f9..20d0b73459c4 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt @@ -44,27 +44,35 @@ import com.fasterxml.jackson.annotation.JsonProperty data class DefaultValue ( + @param:JsonProperty("array_string_enum_ref_default") @get:JsonProperty("array_string_enum_ref_default") val arrayStringEnumRefDefault: kotlin.collections.List? = null, + @param:JsonProperty("array_string_enum_default") @get:JsonProperty("array_string_enum_default") val arrayStringEnumDefault: kotlin.collections.List? = null, + @param:JsonProperty("array_string_default") @get:JsonProperty("array_string_default") val arrayStringDefault: kotlin.collections.List? = arrayListOf("failure","skipped"), + @param:JsonProperty("array_integer_default") @get:JsonProperty("array_integer_default") val arrayIntegerDefault: kotlin.collections.List? = arrayListOf(1,3), + @param:JsonProperty("array_string") @get:JsonProperty("array_string") val arrayString: kotlin.collections.List? = null, + @param:JsonProperty("array_string_nullable") @get:JsonProperty("array_string_nullable") val arrayStringNullable: kotlin.collections.List? = null, + @param:JsonProperty("array_string_extension_nullable") @get:JsonProperty("array_string_extension_nullable") val arrayStringExtensionNullable: kotlin.collections.List? = null, + @param:JsonProperty("string_nullable") @get:JsonProperty("string_nullable") val stringNullable: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt index c28a6cd52558..c2a244b0e1fd 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class NumberPropertiesOnly ( + @param:JsonProperty("number") @get:JsonProperty("number") val number: java.math.BigDecimal? = null, + @param:JsonProperty("float") @get:JsonProperty("float") val float: kotlin.Float? = null, + @param:JsonProperty("double") @get:JsonProperty("double") val double: kotlin.Double? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt index c902056dc111..ed3cd54abb95 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt index 14f1305ac5f9..9c0f39d1f515 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt @@ -38,9 +38,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Query ( /* Query */ + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("outcomes") @get:JsonProperty("outcomes") val outcomes: kotlin.collections.List? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt index ee0d9be5a12b..1bdda47330d9 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt index 0b5578820306..92b5520493db 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt @@ -36,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty data class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter ( + @param:JsonProperty("values") @get:JsonProperty("values") val propertyValues: kotlin.collections.List? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt index 667d8fef1aea..99fc8bc9f08f 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Bird ( + @param:JsonProperty("size") @get:JsonProperty("size") val propertySize: kotlin.String? = null, + @param:JsonProperty("color") @get:JsonProperty("color") val color: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt index 5489682a7c82..3845ce06b70a 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt index a858f72179f9..20d0b73459c4 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt @@ -44,27 +44,35 @@ import com.fasterxml.jackson.annotation.JsonProperty data class DefaultValue ( + @param:JsonProperty("array_string_enum_ref_default") @get:JsonProperty("array_string_enum_ref_default") val arrayStringEnumRefDefault: kotlin.collections.List? = null, + @param:JsonProperty("array_string_enum_default") @get:JsonProperty("array_string_enum_default") val arrayStringEnumDefault: kotlin.collections.List? = null, + @param:JsonProperty("array_string_default") @get:JsonProperty("array_string_default") val arrayStringDefault: kotlin.collections.List? = arrayListOf("failure","skipped"), + @param:JsonProperty("array_integer_default") @get:JsonProperty("array_integer_default") val arrayIntegerDefault: kotlin.collections.List? = arrayListOf(1,3), + @param:JsonProperty("array_string") @get:JsonProperty("array_string") val arrayString: kotlin.collections.List? = null, + @param:JsonProperty("array_string_nullable") @get:JsonProperty("array_string_nullable") val arrayStringNullable: kotlin.collections.List? = null, + @param:JsonProperty("array_string_extension_nullable") @get:JsonProperty("array_string_extension_nullable") val arrayStringExtensionNullable: kotlin.collections.List? = null, + @param:JsonProperty("string_nullable") @get:JsonProperty("string_nullable") val stringNullable: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt index c28a6cd52558..c2a244b0e1fd 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class NumberPropertiesOnly ( + @param:JsonProperty("number") @get:JsonProperty("number") val number: java.math.BigDecimal? = null, + @param:JsonProperty("float") @get:JsonProperty("float") val float: kotlin.Float? = null, + @param:JsonProperty("double") @get:JsonProperty("double") val double: kotlin.Double? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt index c902056dc111..ed3cd54abb95 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt index 14f1305ac5f9..9c0f39d1f515 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt @@ -38,9 +38,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Query ( /* Query */ + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("outcomes") @get:JsonProperty("outcomes") val outcomes: kotlin.collections.List? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt index ee0d9be5a12b..1bdda47330d9 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt index 0b5578820306..92b5520493db 100644 --- a/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt +++ b/samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt @@ -36,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty data class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter ( + @param:JsonProperty("values") @get:JsonProperty("values") val propertyValues: kotlin.collections.List? = null diff --git a/samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/src/main/kotlin/org/openapitools/client/models/PingRequest.kt b/samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/src/main/kotlin/org/openapitools/client/models/PingRequest.kt index 17fa6610a1c9..6354e081ad3e 100644 --- a/samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/src/main/kotlin/org/openapitools/client/models/PingRequest.kt +++ b/samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/src/main/kotlin/org/openapitools/client/models/PingRequest.kt @@ -36,6 +36,7 @@ import com.fasterxml.jackson.annotation.JsonProperty data class PingRequest ( + @param:JsonProperty("msg") @get:JsonProperty("msg") val msg: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index 0bd2e61f4f4d..f15a2813981e 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index cf08e6531e97..f8e01ef3253c 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index 7f1cd63d1bd7..a87ce400fad2 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index 227ea930ece9..a87a1c194345 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index 7f1cd63d1bd7..a87ce400fad2 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index 9200b5b77033..8a367e796c23 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt index 7f1cd63d1bd7..a87ce400fad2 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt index 227ea930ece9..a87a1c194345 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Order.kt index 7f1cd63d1bd7..a87ce400fad2 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt index 227ea930ece9..a87a1c194345 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt index 9fcb7ba5f44f..a6caf57b5a10 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 62de4c96650a..3bf0e0e41370 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt index 7f1cd63d1bd7..a87ce400fad2 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt index 227ea930ece9..a87a1c194345 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt index 0123aab7727e..cd448ef6cdba 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/User.kt index 413970d9de6a..e28a7b76df60 100644 --- a/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt index cdaa4cd41a5b..203321fda99b 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -36,9 +36,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index b6d226916416..54953899da1a 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -37,12 +37,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt index cb0b02a12f3a..413e49518001 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -40,22 +40,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt index fc516b0715c2..b8c7568be88f 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -42,22 +42,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt index c4d04fd1eed3..bc31ade3d163 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -36,9 +36,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt index d80f2a6d73f4..b02d1d06eede 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt @@ -42,28 +42,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index cdaa4cd41a5b..203321fda99b 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -36,9 +36,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index b6d226916416..54953899da1a 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -37,12 +37,15 @@ import com.fasterxml.jackson.annotation.JsonProperty data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index cb0b02a12f3a..413e49518001 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -40,22 +40,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index fc516b0715c2..b8c7568be88f 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -42,22 +42,28 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index c4d04fd1eed3..bc31ade3d163 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -36,9 +36,11 @@ import com.fasterxml.jackson.annotation.JsonProperty data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index d80f2a6d73f4..b02d1d06eede 100644 --- a/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-jvm-vertx-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -42,28 +42,36 @@ import com.fasterxml.jackson.annotation.JsonProperty data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt index e7dc9e858de2..662b989431ab 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt @@ -37,9 +37,11 @@ import java.io.Serializable data class Category ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt index 820ee37a272f..5e97d4b64764 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt @@ -38,12 +38,15 @@ import java.io.Serializable data class ModelApiResponse ( + @param:JsonProperty("code") @get:JsonProperty("code") val code: kotlin.Int? = null, + @param:JsonProperty("type") @get:JsonProperty("type") val type: kotlin.String? = null, + @param:JsonProperty("message") @get:JsonProperty("message") val message: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt index 405338160d6f..5af8de367f67 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt @@ -41,22 +41,28 @@ import java.io.Serializable data class Order ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("petId") @get:JsonProperty("petId") val petId: kotlin.Long? = null, + @param:JsonProperty("quantity") @get:JsonProperty("quantity") val quantity: kotlin.Int? = null, + @param:JsonProperty("shipDate") @get:JsonProperty("shipDate") val shipDate: java.time.OffsetDateTime? = null, /* Order Status */ + @param:JsonProperty("status") @get:JsonProperty("status") val status: Order.Status? = null, + @param:JsonProperty("complete") @get:JsonProperty("complete") val complete: kotlin.Boolean? = false diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt index 7db1553f338a..8ba0234fe261 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt @@ -43,22 +43,28 @@ import java.io.Serializable data class Pet ( + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String, + @param:JsonProperty("photoUrls") @get:JsonProperty("photoUrls") val photoUrls: kotlin.collections.List, + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("category") @get:JsonProperty("category") val category: Category? = null, + @param:JsonProperty("tags") @get:JsonProperty("tags") val tags: kotlin.collections.List? = null, /* pet status in the store */ + @param:JsonProperty("status") @get:JsonProperty("status") @Deprecated(message = "This property is deprecated.") val status: Pet.Status? = null diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt index 2f2793cf23ed..b2ef5e5f3d77 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt @@ -37,9 +37,11 @@ import java.io.Serializable data class Tag ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("name") @get:JsonProperty("name") val name: kotlin.String? = null diff --git a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/User.kt index 8a72e0f1d41e..a32dfa532a79 100644 --- a/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/User.kt +++ b/samples/client/petstore/kotlin-retrofit2-jackson/src/main/kotlin/org/openapitools/client/models/User.kt @@ -43,28 +43,36 @@ import java.io.Serializable data class User ( + @param:JsonProperty("id") @get:JsonProperty("id") val id: kotlin.Long? = null, + @param:JsonProperty("username") @get:JsonProperty("username") val username: kotlin.String? = null, + @param:JsonProperty("firstName") @get:JsonProperty("firstName") val firstName: kotlin.String? = null, + @param:JsonProperty("lastName") @get:JsonProperty("lastName") val lastName: kotlin.String? = null, + @param:JsonProperty("email") @get:JsonProperty("email") val email: kotlin.String? = null, + @param:JsonProperty("password") @get:JsonProperty("password") val password: kotlin.String? = null, + @param:JsonProperty("phone") @get:JsonProperty("phone") val phone: kotlin.String? = null, /* User Status */ + @param:JsonProperty("userStatus") @get:JsonProperty("userStatus") val userStatus: kotlin.Int? = null From 331159e33c128088facb2ae0218441d4898d549d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= Date: Mon, 15 Jun 2026 13:59:46 +0200 Subject: [PATCH 3/4] add test open api spec --- .../3_0/kotlin/param-json-property.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/openapi-generator/src/test/resources/3_0/kotlin/param-json-property.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/kotlin/param-json-property.yaml b/modules/openapi-generator/src/test/resources/3_0/kotlin/param-json-property.yaml new file mode 100644 index 000000000000..17e4fce8ce3b --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/kotlin/param-json-property.yaml @@ -0,0 +1,28 @@ +openapi: "3.0.0" +info: + title: Test API for @param:JsonProperty annotation + version: "1.0.0" +paths: + /items: + get: + operationId: listItems + responses: + "200": + description: Success + content: + application/json: + schema: + $ref: "#/components/schemas/Item" +components: + schemas: + Item: + type: object + required: + - snake_case_value + properties: + snake_case_value: + type: string + description: A required property to be renamed via nameMappings + 2nd_field: + type: string + description: An optional property whose name starts with a digit and is auto-renamed From d1976d7e63557559255309dd93d1c54edc6c74d2 Mon Sep 17 00:00:00 2001 From: Jachym Metlicka Date: Mon, 15 Jun 2026 23:33:12 +0200 Subject: [PATCH 4/4] fix failing test by extending the lookup window --- .../codegen/kotlin/spring/KotlinSpringServerCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index a6d50082c056..7fbc5ceea289 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -6476,7 +6476,7 @@ public void requiredNullable_scenario3_optionalNonNullable_withDefault() throws String content = Files.readString(modelFile); int idx = content.indexOf("val optionalNonNullableWithDefault:"); Assert.assertTrue(idx >= 0, "optionalNonNullableWithDefault property must exist"); - String context = content.substring(Math.max(0, idx - 200), idx); + String context = content.substring(Math.max(0, idx - 300), idx); Assert.assertTrue(context.contains("@field:JsonInclude(JsonInclude.Include.NON_NULL)"), "optionalNonNullableWithDefault must have @JsonInclude(NON_NULL)"); Assert.assertTrue(context.contains("@field:JsonSetter(nulls = Nulls.SKIP)"),