fix #11353 use @get:JsonProperty instead of @field:JsonProperty (#19186)

OpenAPITools · Jul 17, 2024 · 2f5529a · 2f5529a
1 parent 045f4b6
commit 2f5529a
Show file tree

Hide file tree

Showing 72 changed files with 297 additions and 297 deletions.
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
@@ -9,7 +9,7 @@
     @SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
     {{/gson}}
     {{#jackson}}
-    @field:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
+    @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
     {{/jackson}}
     {{#kotlinx_serialization}}
     {{^isEnum}}{{^isArray}}{{^isPrimitiveType}}{{^isModel}}@Contextual {{/isModel}}{{/isPrimitiveType}}{{/isArray}}{{/isEnum}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}")

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
@@ -9,7 +9,7 @@
     @SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
     {{/gson}}
     {{#jackson}}
-    @field:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
+    @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
     {{/jackson}}
     {{#kotlinx_serialization}}
     {{^isEnum}}{{^isArray}}{{^isPrimitiveType}}{{^isModel}}@Contextual {{/isModel}}{{/isPrimitiveType}}{{/isArray}}{{/isEnum}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}")

diff --git a/...api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt b/...api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Bird.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Bird (
 
-    @field:JsonProperty("size")
+    @get:JsonProperty("size")
     val propertySize: kotlin.String? = null,
 
-    @field:JsonProperty("color")
+    @get:JsonProperty("color")
     val color: kotlin.String? = null
 
 ) {

diff --git a/...kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/...kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Category (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String? = null
 
 ) {

diff --git a/...in-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt b/...in-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt
@@ -36,28 +36,28 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class DefaultValue (
 
-    @field:JsonProperty("array_string_enum_ref_default")
+    @get:JsonProperty("array_string_enum_ref_default")
     val arrayStringEnumRefDefault: kotlin.collections.List<StringEnumRef>? = null,
 
-    @field:JsonProperty("array_string_enum_default")
+    @get:JsonProperty("array_string_enum_default")
     val arrayStringEnumDefault: kotlin.collections.List<DefaultValue.ArrayStringEnumDefault>? = null,
 
-    @field:JsonProperty("array_string_default")
+    @get:JsonProperty("array_string_default")
     val arrayStringDefault: kotlin.collections.List<kotlin.String>? = arrayListOf("failure","skipped"),
 
-    @field:JsonProperty("array_integer_default")
+    @get:JsonProperty("array_integer_default")
     val arrayIntegerDefault: kotlin.collections.List<kotlin.Int>? = arrayListOf(1,3),
 
-    @field:JsonProperty("array_string")
+    @get:JsonProperty("array_string")
     val arrayString: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("array_string_nullable")
+    @get:JsonProperty("array_string_nullable")
     val arrayStringNullable: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("array_string_extension_nullable")
+    @get:JsonProperty("array_string_extension_nullable")
     val arrayStringExtensionNullable: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("string_nullable")
+    @get:JsonProperty("string_nullable")
     val stringNullable: kotlin.String? = null
 
 ) {

diff --git a/...pring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt b/...pring-3-restclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class NumberPropertiesOnly (
 
-    @field:JsonProperty("number")
+    @get:JsonProperty("number")
     val number: java.math.BigDecimal? = null,
 
-    @field:JsonProperty("float")
+    @get:JsonProperty("float")
     val float: kotlin.Float? = null,
 
-    @field:JsonProperty("double")
+    @get:JsonProperty("double")
     val double: kotlin.Double? = null
 
 ) {

diff --git a/..._api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/..._api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -35,23 +35,23 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Pet (
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String,
 
-    @field:JsonProperty("photoUrls")
+    @get:JsonProperty("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("category")
+    @get:JsonProperty("category")
     val category: Category? = null,
 
-    @field:JsonProperty("tags")
+    @get:JsonProperty("tags")
     val tags: kotlin.collections.List<Tag>? = null,
 
     /* pet status in the store */
-    @field:JsonProperty("status")
+    @get:JsonProperty("status")
     val status: Pet.Status? = null
 
 ) {

diff --git a/...pi/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt b/...pi/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Query.kt
@@ -30,10 +30,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 data class Query (
 
     /* Query */
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("outcomes")
+    @get:JsonProperty("outcomes")
     val outcomes: kotlin.collections.List<Query.Outcomes>? = null
 
 ) {

diff --git a/..._api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/..._api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Tag (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String? = null
 
 ) {

diff --git a/...penapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt b/...penapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter (
 
-    @field:JsonProperty("values")
+    @get:JsonProperty("values")
     val propertyValues: kotlin.collections.List<kotlin.String>? = null
 
 ) {

diff --git a/..._api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt b/..._api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Bird.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Bird (
 
-    @field:JsonProperty("size")
+    @get:JsonProperty("size")
     val propertySize: kotlin.String? = null,
 
-    @field:JsonProperty("color")
+    @get:JsonProperty("color")
     val color: kotlin.String? = null
 
 ) {

diff --git a/.../kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt b/.../kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Category (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String? = null
 
 ) {

diff --git a/...lin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt b/...lin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/DefaultValue.kt
@@ -36,28 +36,28 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class DefaultValue (
 
-    @field:JsonProperty("array_string_enum_ref_default")
+    @get:JsonProperty("array_string_enum_ref_default")
     val arrayStringEnumRefDefault: kotlin.collections.List<StringEnumRef>? = null,
 
-    @field:JsonProperty("array_string_enum_default")
+    @get:JsonProperty("array_string_enum_default")
     val arrayStringEnumDefault: kotlin.collections.List<DefaultValue.ArrayStringEnumDefault>? = null,
 
-    @field:JsonProperty("array_string_default")
+    @get:JsonProperty("array_string_default")
     val arrayStringDefault: kotlin.collections.List<kotlin.String>? = arrayListOf("failure","skipped"),
 
-    @field:JsonProperty("array_integer_default")
+    @get:JsonProperty("array_integer_default")
     val arrayIntegerDefault: kotlin.collections.List<kotlin.Int>? = arrayListOf(1,3),
 
-    @field:JsonProperty("array_string")
+    @get:JsonProperty("array_string")
     val arrayString: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("array_string_nullable")
+    @get:JsonProperty("array_string_nullable")
     val arrayStringNullable: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("array_string_extension_nullable")
+    @get:JsonProperty("array_string_extension_nullable")
     val arrayStringExtensionNullable: kotlin.collections.List<kotlin.String>? = null,
 
-    @field:JsonProperty("string_nullable")
+    @get:JsonProperty("string_nullable")
     val stringNullable: kotlin.String? = null
 
 ) {

diff --git a/...spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt b/...spring-3-webclient/src/main/kotlin/org/openapitools/client/models/NumberPropertiesOnly.kt
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class NumberPropertiesOnly (
 
-    @field:JsonProperty("number")
+    @get:JsonProperty("number")
     val number: java.math.BigDecimal? = null,
 
-    @field:JsonProperty("float")
+    @get:JsonProperty("float")
     val float: kotlin.Float? = null,
 
-    @field:JsonProperty("double")
+    @get:JsonProperty("double")
     val double: kotlin.Double? = null
 
 ) {

diff --git a/...o_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt b/...o_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -35,23 +35,23 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Pet (
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String,
 
-    @field:JsonProperty("photoUrls")
+    @get:JsonProperty("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("category")
+    @get:JsonProperty("category")
     val category: Category? = null,
 
-    @field:JsonProperty("tags")
+    @get:JsonProperty("tags")
     val tags: kotlin.collections.List<Tag>? = null,
 
     /* pet status in the store */
-    @field:JsonProperty("status")
+    @get:JsonProperty("status")
     val status: Pet.Status? = null
 
 ) {

diff --git a/...api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt b/...api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Query.kt
@@ -30,10 +30,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 data class Query (
 
     /* Query */
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("outcomes")
+    @get:JsonProperty("outcomes")
     val outcomes: kotlin.collections.List<Query.Outcomes>? = null
 
 ) {

diff --git a/...o_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt b/...o_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Tag (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String? = null
 
 ) {

diff --git a/...penapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt b/...penapitools/client/models/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.kt
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter (
 
-    @field:JsonProperty("values")
+    @get:JsonProperty("values")
     val propertyValues: kotlin.collections.List<kotlin.String>? = null
 
 ) {

diff --git a/...client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/...client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Category (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String? = null
 
 ) {

diff --git a/...etstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt b/...etstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class ModelApiResponse (
 
-    @field:JsonProperty("code")
+    @get:JsonProperty("code")
     val code: kotlin.Int? = null,
 
-    @field:JsonProperty("type")
+    @get:JsonProperty("type")
     val type: kotlin.String? = null,
 
-    @field:JsonProperty("message")
+    @get:JsonProperty("message")
     val message: kotlin.String? = null
 
 ) {

diff --git a/...es/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/...es/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -33,23 +33,23 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Order (
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("petId")
+    @get:JsonProperty("petId")
     val petId: kotlin.Long? = null,
 
-    @field:JsonProperty("quantity")
+    @get:JsonProperty("quantity")
     val quantity: kotlin.Int? = null,
 
-    @field:JsonProperty("shipDate")
+    @get:JsonProperty("shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
 
     /* Order Status */
-    @field:JsonProperty("status")
+    @get:JsonProperty("status")
     val status: Order.Status? = null,
 
-    @field: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
@@ -35,23 +35,23 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class Pet (
 
-    @field:JsonProperty("name")
+    @get:JsonProperty("name")
     val name: kotlin.String,
 
-    @field:JsonProperty("photoUrls")
+    @get:JsonProperty("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
 
-    @field:JsonProperty("id")
+    @get:JsonProperty("id")
     val id: kotlin.Long? = null,
 
-    @field:JsonProperty("category")
+    @get:JsonProperty("category")
     val category: Category? = null,
 
-    @field:JsonProperty("tags")
+    @get:JsonProperty("tags")
     val tags: kotlin.collections.List<Tag>? = null,
 
     /* pet status in the store */
-    @field:JsonProperty("status")
+    @get:JsonProperty("status")
     val status: Pet.Status? = null
 
 ) {