[java-spring] Move JsonProperty annotation from field to getter (#13781) (fix #5705)

* 5705: Move JsonProperty annotation to the getters

* Regenerate samples

* Add jackson check

* Add test

* Minor fix

* Fix test

* Fix version

* [Java][Spring] update test & samples; add serialization/deserialization test

---------

Co-authored-by: Oleh Kurpiak <oleh.kurpiak@gmail.com>

modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache

@@ -45,7 +45,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
     {{/isContainer}}
     {{/isEnum}}
   {{#jackson}}
-  @JsonProperty("{{baseName}}")
   {{#withXml}}
   @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
   {{/withXml}}
@@ -185,6 +184,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
   {{/swagger1AnnotationLibrary}}
+  {{#jackson}}
+  @JsonProperty("{{baseName}}")
+  {{/jackson}}
   public {{>nullableDataType}} {{getter}}() {
     return {{name}};
   }

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java

@@ -35,6 +35,13 @@ public abstract class AbstractAnnotationAssert<ACTUAL extends AbstractAnnotation
         return myself();
     }
 
+    public ACTUAL doesNotContainsWithName(final String name) {
+        super
+            .withFailMessage("Should have annotation with name: " + name)
+            .noneMatch(annotation -> annotation.getNameAsString().equals(name));
+        return myself();
+    }
+
     public ACTUAL containsWithNameAndAttributes(final String name, final Map<String, String> attributes) {
         super
             .withFailMessage("Should have annotation with name: " + name + " and attributes: " + attributes + ", but was: " + actual)

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -2144,4 +2144,57 @@ public class SpringCodegenTest {
         return generator.opts(input).generate().stream()
                 .collect(Collectors.toMap(File::getName, Function.identity()));
     }
+
+    @Test
+    public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        OpenAPI openAPI = new OpenAPIParser()
+            .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI();
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setLibrary(SPRING_BOOT);
+        codegen.setOutputDir(output.getAbsolutePath());
+
+        ClientOptInput input = new ClientOptInput()
+            .openAPI(openAPI)
+            .config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(input).generate().stream()
+            .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java"))
+            .hasProperty("normalPropertyName")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("UPPER_CASE_PROPERTY_SNAKE")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("lowerCasePropertyDashes")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("propertyNameWithSpaces")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .assertMethod("getNormalPropertyName")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getUPPERCASEPROPERTYSNAKE")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getLowerCasePropertyDashes")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getPropertyNameWithSpaces")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\""));
+    }
 }

modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1091,6 +1091,26 @@ paths:
         - petstore_auth:
             - write:pets
             - read:pets
+  /fake/{petId}/response-object-different-names:
+    get:
+      tags:
+        - pet
+      operationId: responseObjectDifferentNames
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        200:
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ResponseObjectWithDifferentFieldNames"
 servers:
   - url: http://petstore.swagger.io:80/v2
 components:
@@ -2006,3 +2026,14 @@ components:
           items:
             type: string
           default: ["foo", "bar"]
+    ResponseObjectWithDifferentFieldNames:
+      type: object
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string

samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java

@@ -26,23 +26,17 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("@type")
   private String atType = "Pet";
 
-  @JsonProperty("age")
   private Integer age = 4;
 
-  @JsonProperty("happy")
   private Boolean happy = true;
 
-  @JsonProperty("price")
   private BigDecimal price = new BigDecimal("32000000000");
 
-  @JsonProperty("lastFeed")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault()));
 
-  @JsonProperty("dateOfBirth")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate dateOfBirth = LocalDate.parse("2021-01-01");
 
@@ -73,6 +67,7 @@ public class Pet {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
@@ -92,6 +87,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("age")
   public Integer getAge() {
     return age;
   }
@@ -111,6 +107,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("happy")
   public Boolean getHappy() {
     return happy;
   }
@@ -130,6 +127,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("price")
   public BigDecimal getPrice() {
     return price;
   }
@@ -149,6 +147,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("lastFeed")
   public OffsetDateTime getLastFeed() {
     return lastFeed;
   }
@@ -168,6 +167,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateOfBirth")
   public LocalDate getDateOfBirth() {
     return dateOfBirth;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java

@@ -23,10 +23,8 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -40,6 +38,7 @@ public class Category {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public class Category {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -25,13 +25,10 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -45,6 +42,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -64,6 +62,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -83,6 +82,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java

@@ -26,16 +26,12 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -76,10 +72,8 @@ public class Order {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -93,6 +87,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -112,6 +107,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -131,6 +127,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -150,6 +147,7 @@ public class Order {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -169,6 +167,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -188,6 +187,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java

@@ -28,20 +28,15 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -82,7 +77,6 @@ public class Pet {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -113,6 +107,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -132,6 +127,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -151,6 +147,7 @@ public class Pet {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -178,6 +175,7 @@ public class Pet {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -205,6 +203,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -224,6 +223,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java

@@ -23,10 +23,8 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -40,6 +38,7 @@ public class Tag {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public class Tag {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java

@@ -23,28 +23,20 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -58,6 +50,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -77,6 +70,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -96,6 +90,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -115,6 +110,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -134,6 +130,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -153,6 +150,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -172,6 +170,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -191,6 +190,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java

@@ -23,10 +23,8 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -40,6 +38,7 @@ public class Category {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public class Category {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -25,13 +25,10 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -45,6 +42,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -64,6 +62,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -83,6 +82,7 @@ public class ModelApiResponse {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java

@@ -26,16 +26,12 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -76,10 +72,8 @@ public class Order {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -93,6 +87,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -112,6 +107,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -131,6 +127,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -150,6 +147,7 @@ public class Order {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -169,6 +167,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -188,6 +187,7 @@ public class Order {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java

@@ -28,20 +28,15 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -82,7 +77,6 @@ public class Pet {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -113,6 +107,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -132,6 +127,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -151,6 +147,7 @@ public class Pet {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -178,6 +175,7 @@ public class Pet {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -205,6 +203,7 @@ public class Pet {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -224,6 +223,7 @@ public class Pet {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java

@@ -23,10 +23,8 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -40,6 +38,7 @@ public class Tag {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public class Tag {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java

@@ -23,28 +23,20 @@ import javax.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -58,6 +50,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -77,6 +70,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -96,6 +90,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -115,6 +110,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -134,6 +130,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -153,6 +150,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -172,6 +170,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -191,6 +190,7 @@ public class User {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }

samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES

@@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import java.util.Set;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,22 @@ public interface PetApi {
     );
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @HttpExchange(
+        method = "GET",
+        value = "/fake/{petId}/response-object-different-names",
+        accept = "application/json"
+    )
+    Mono<ResponseEntity<ResponseObjectWithDifferentFieldNames>> responseObjectDifferentNames(
+         @PathVariable("petId") Long petId
+    );
+
+
     /**
      * PUT /pet : Update an existing pet
      * 

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -34,6 +33,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -22,7 +22,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -35,6 +34,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -34,6 +33,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -26,45 +26,34 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -85,6 +74,7 @@ public class AdditionalPropertiesClass {
    * @return mapString
   */
   
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -111,6 +101,7 @@ public class AdditionalPropertiesClass {
    * @return mapNumber
   */
   
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -137,6 +128,7 @@ public class AdditionalPropertiesClass {
    * @return mapInteger
   */
   
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -163,6 +155,7 @@ public class AdditionalPropertiesClass {
    * @return mapBoolean
   */
   
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -189,6 +182,7 @@ public class AdditionalPropertiesClass {
    * @return mapArrayInteger
   */
   
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -215,6 +209,7 @@ public class AdditionalPropertiesClass {
    * @return mapArrayAnytype
   */
   
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -241,6 +236,7 @@ public class AdditionalPropertiesClass {
    * @return mapMapString
   */
   
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -267,6 +263,7 @@ public class AdditionalPropertiesClass {
    * @return mapMapAnytype
   */
   
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -285,6 +282,7 @@ public class AdditionalPropertiesClass {
    * @return anytype1
   */
   
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -303,6 +301,7 @@ public class AdditionalPropertiesClass {
    * @return anytype2
   */
   
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -321,6 +320,7 @@ public class AdditionalPropertiesClass {
    * @return anytype3
   */
   
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -34,6 +33,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -22,7 +22,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -35,6 +34,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -34,6 +33,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -34,6 +33,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java

@@ -36,10 +36,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -68,6 +66,7 @@ public class Animal {
    * @return className
   */
   @NotNull
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -86,6 +85,7 @@ public class Animal {
    * @return color
   */
   
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -22,7 +22,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -44,6 +43,7 @@ public class ArrayOfArrayOfNumberOnly {
    * @return arrayArrayNumber
   */
   
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -22,7 +22,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   
   private List<BigDecimal> arrayNumber;
 
@@ -44,6 +43,7 @@ public class ArrayOfNumberOnly {
    * @return arrayNumber
   */
   
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java

@@ -22,15 +22,12 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -52,6 +49,7 @@ public class ArrayTest {
    * @return arrayOfString
   */
   
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -78,6 +76,7 @@ public class ArrayTest {
    * @return arrayArrayOfInteger
   */
   
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -104,6 +103,7 @@ public class ArrayTest {
    * @return arrayArrayOfModel
   */
   
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java

@@ -64,7 +64,6 @@ public class BigCat extends Cat {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -93,6 +92,7 @@ public class BigCat extends Cat {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java

@@ -61,7 +61,6 @@ public class BigCatAllOf {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -74,6 +73,7 @@ public class BigCatAllOf {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java

@@ -19,22 +19,16 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -47,6 +41,7 @@ public class Capitalization {
    * @return smallCamel
   */
   
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -65,6 +60,7 @@ public class Capitalization {
    * @return capitalCamel
   */
   
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -83,6 +79,7 @@ public class Capitalization {
    * @return smallSnake
   */
   
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -101,6 +98,7 @@ public class Capitalization {
    * @return capitalSnake
   */
   
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -119,6 +117,7 @@ public class Capitalization {
    * @return scAETHFlowPoints
   */
   
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -137,6 +136,7 @@ public class Capitalization {
    * @return ATT_NAME
   */
   
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java

@@ -33,7 +33,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -62,6 +61,7 @@ public class Cat extends Animal {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -34,6 +33,7 @@ public class CatAllOf {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java

@@ -19,10 +19,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -51,6 +49,7 @@ public class Category {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -69,6 +68,7 @@ public class Category {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java

@@ -19,7 +19,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -32,6 +31,7 @@ public class ClassModel {
    * @return propertyClass
   */
   
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java

@@ -19,7 +19,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -32,6 +31,7 @@ public class Client {
    * @return client
   */
   
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java

@@ -24,19 +24,15 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -75,6 +71,7 @@ public class ContainerDefaultValue {
    * @return nullableArray
   */
   
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -101,6 +98,7 @@ public class ContainerDefaultValue {
    * @return nullableRequiredArray
   */
   @NotNull
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -127,6 +125,7 @@ public class ContainerDefaultValue {
    * @return requiredArray
   */
   @NotNull
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -153,6 +152,7 @@ public class ContainerDefaultValue {
    * @return nullableArrayWithDefault
   */
   
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -53,6 +52,7 @@ public class Dog extends Animal {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -34,6 +33,7 @@ public class DogAllOf {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java

@@ -57,7 +57,6 @@ public class EnumArrays {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -95,7 +94,6 @@ public class EnumArrays {
     }
   }
 
-  @JsonProperty("array_enum")
   
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -109,6 +107,7 @@ public class EnumArrays {
    * @return justSymbol
   */
   
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -135,6 +134,7 @@ public class EnumArrays {
    * @return arrayEnum
   */
   
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java

@@ -60,7 +60,6 @@ public class EnumTest {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -100,7 +99,6 @@ public class EnumTest {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -138,7 +136,6 @@ public class EnumTest {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -176,10 +173,8 @@ public class EnumTest {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -208,6 +203,7 @@ public class EnumTest {
    * @return enumString
   */
   
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -226,6 +222,7 @@ public class EnumTest {
    * @return enumStringRequired
   */
   @NotNull
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -244,6 +241,7 @@ public class EnumTest {
    * @return enumInteger
   */
   
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -262,6 +260,7 @@ public class EnumTest {
    * @return enumNumber
   */
   
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -280,6 +279,7 @@ public class EnumTest {
    * @return outerEnum
   */
   
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java

@@ -19,7 +19,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -32,6 +31,7 @@ public class File {
    * @return sourceURI
   */
   
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java

@@ -22,10 +22,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   
   private List<File> files;
 
@@ -39,6 +37,7 @@ public class FileSchemaTestClass {
    * @return file
   */
   
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -65,6 +64,7 @@ public class FileSchemaTestClass {
    * @return files
   */
   
+  @JsonProperty("files")
   public List<File> getFiles() {
     return files;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java

@@ -27,48 +27,34 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -102,6 +88,7 @@ public class FormatTest {
    * @return integer
   */
   
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -122,6 +109,7 @@ public class FormatTest {
    * @return int32
   */
   
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -140,6 +128,7 @@ public class FormatTest {
    * @return int64
   */
   
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -160,6 +149,7 @@ public class FormatTest {
    * @return number
   */
   @NotNull
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -180,6 +170,7 @@ public class FormatTest {
    * @return _float
   */
   
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -200,6 +191,7 @@ public class FormatTest {
    * @return _double
   */
   
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -218,6 +210,7 @@ public class FormatTest {
    * @return string
   */
   
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -236,6 +229,7 @@ public class FormatTest {
    * @return _byte
   */
   @NotNull
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -254,6 +248,7 @@ public class FormatTest {
    * @return binary
   */
   
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -272,6 +267,7 @@ public class FormatTest {
    * @return date
   */
   @NotNull
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -290,6 +286,7 @@ public class FormatTest {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -308,6 +305,7 @@ public class FormatTest {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -326,6 +324,7 @@ public class FormatTest {
    * @return password
   */
   @NotNull
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -344,6 +343,7 @@ public class FormatTest {
    * @return bigDecimal
   */
   
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java

@@ -21,10 +21,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -37,6 +35,7 @@ public class HasOnlyReadOnly {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -55,6 +54,7 @@ public class HasOnlyReadOnly {
    * @return foo
   */
   
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java

@@ -22,7 +22,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -61,15 +60,12 @@ public class MapTest {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -91,6 +87,7 @@ public class MapTest {
    * @return mapMapOfString
   */
   
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -117,6 +114,7 @@ public class MapTest {
    * @return mapOfEnumString
   */
   
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -143,6 +141,7 @@ public class MapTest {
    * @return directMap
   */
   
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -169,6 +168,7 @@ public class MapTest {
    * @return indirectMap
   */
   
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -25,14 +25,11 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   
   private Map<String, Animal> map = new HashMap<>();
 
@@ -46,6 +43,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -64,6 +62,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -90,6 +89,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * @return map
   */
   
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java

@@ -21,10 +21,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -37,6 +35,7 @@ public class Model200Response {
    * @return name
   */
   
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -55,6 +54,7 @@ public class Model200Response {
    * @return propertyClass
   */
   
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java

@@ -21,13 +21,10 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -40,6 +37,7 @@ public class ModelApiResponse {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -58,6 +56,7 @@ public class ModelApiResponse {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -76,6 +75,7 @@ public class ModelApiResponse {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -34,6 +33,7 @@ public class ModelList {
    * @return _123list
   */
   
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -34,6 +33,7 @@ public class ModelReturn {
    * @return _return
   */
   
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java

@@ -19,16 +19,12 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -57,6 +53,7 @@ public class Name {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -75,6 +72,7 @@ public class Name {
    * @return snakeCase
   */
   
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -93,6 +91,7 @@ public class Name {
    * @return property
   */
   
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -111,6 +110,7 @@ public class Name {
    * @return _123number
   */
   
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java

@@ -20,7 +20,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -33,6 +32,7 @@ public class NumberOnly {
    * @return justNumber
   */
   
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java

@@ -22,16 +22,12 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -72,10 +68,8 @@ public class Order {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -88,6 +82,7 @@ public class Order {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -106,6 +101,7 @@ public class Order {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -124,6 +120,7 @@ public class Order {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -142,6 +139,7 @@ public class Order {
    * @return shipDate
   */
   
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -160,6 +158,7 @@ public class Order {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -178,6 +177,7 @@ public class Order {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java

@@ -20,13 +20,10 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -39,6 +36,7 @@ public class OuterComposite {
    * @return myNumber
   */
   
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -57,6 +55,7 @@ public class OuterComposite {
    * @return myString
   */
   
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -75,6 +74,7 @@ public class OuterComposite {
    * @return myBoolean
   */
   
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java

@@ -27,20 +27,15 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   
   private List<Tag> tags;
 
@@ -81,7 +76,6 @@ public class Pet {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -111,6 +105,7 @@ public class Pet {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -129,6 +124,7 @@ public class Pet {
    * @return category
   */
   
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -147,6 +143,7 @@ public class Pet {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -173,6 +170,7 @@ public class Pet {
    * @return photoUrls
   */
   @NotNull
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -200,6 +198,7 @@ public class Pet {
    * @return tags
   */
   
+  @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
   }
@@ -218,6 +217,7 @@ public class Pet {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java

@@ -19,10 +19,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -35,6 +33,7 @@ public class ReadOnlyFirst {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -53,6 +52,7 @@ public class ReadOnlyFirst {
    * @return baz
   */
   
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java

@@ -0,0 +1,149 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.constraints.NotNull;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -34,6 +33,7 @@ public class SpecialModelName {
    * @return $specialPropertyName
   */
   
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java

@@ -19,10 +19,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -35,6 +33,7 @@ public class Tag {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -53,6 +52,7 @@ public class Tag {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java

@@ -22,19 +22,14 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -68,6 +63,7 @@ public class TypeHolderDefault {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -86,6 +82,7 @@ public class TypeHolderDefault {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -104,6 +101,7 @@ public class TypeHolderDefault {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -122,6 +120,7 @@ public class TypeHolderDefault {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -148,6 +147,7 @@ public class TypeHolderDefault {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java

@@ -22,22 +22,16 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +66,7 @@ public class TypeHolderExample {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +85,7 @@ public class TypeHolderExample {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -108,6 +104,7 @@ public class TypeHolderExample {
    * @return floatItem
   */
   @NotNull
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -126,6 +123,7 @@ public class TypeHolderExample {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -144,6 +142,7 @@ public class TypeHolderExample {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -170,6 +169,7 @@ public class TypeHolderExample {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java

@@ -19,28 +19,20 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -53,6 +45,7 @@ public class User {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -71,6 +64,7 @@ public class User {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -89,6 +83,7 @@ public class User {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -107,6 +102,7 @@ public class User {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -125,6 +121,7 @@ public class User {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -143,6 +140,7 @@ public class User {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -161,6 +159,7 @@ public class User {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -179,6 +178,7 @@ public class User {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }

samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java

@@ -22,99 +22,70 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   
   private List<Integer> prefixNsWrappedArray;
 
@@ -128,6 +99,7 @@ public class XmlItem {
    * @return attributeString
   */
   
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -146,6 +118,7 @@ public class XmlItem {
    * @return attributeNumber
   */
   
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -164,6 +137,7 @@ public class XmlItem {
    * @return attributeInteger
   */
   
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -182,6 +156,7 @@ public class XmlItem {
    * @return attributeBoolean
   */
   
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -208,6 +183,7 @@ public class XmlItem {
    * @return wrappedArray
   */
   
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -226,6 +202,7 @@ public class XmlItem {
    * @return nameString
   */
   
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -244,6 +221,7 @@ public class XmlItem {
    * @return nameNumber
   */
   
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -262,6 +240,7 @@ public class XmlItem {
    * @return nameInteger
   */
   
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -280,6 +259,7 @@ public class XmlItem {
    * @return nameBoolean
   */
   
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -306,6 +286,7 @@ public class XmlItem {
    * @return nameArray
   */
   
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -332,6 +313,7 @@ public class XmlItem {
    * @return nameWrappedArray
   */
   
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -350,6 +332,7 @@ public class XmlItem {
    * @return prefixString
   */
   
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -368,6 +351,7 @@ public class XmlItem {
    * @return prefixNumber
   */
   
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -386,6 +370,7 @@ public class XmlItem {
    * @return prefixInteger
   */
   
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -404,6 +389,7 @@ public class XmlItem {
    * @return prefixBoolean
   */
   
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -430,6 +416,7 @@ public class XmlItem {
    * @return prefixArray
   */
   
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -456,6 +443,7 @@ public class XmlItem {
    * @return prefixWrappedArray
   */
   
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -474,6 +462,7 @@ public class XmlItem {
    * @return namespaceString
   */
   
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -492,6 +481,7 @@ public class XmlItem {
    * @return namespaceNumber
   */
   
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -510,6 +500,7 @@ public class XmlItem {
    * @return namespaceInteger
   */
   
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -528,6 +519,7 @@ public class XmlItem {
    * @return namespaceBoolean
   */
   
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -554,6 +546,7 @@ public class XmlItem {
    * @return namespaceArray
   */
   
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -580,6 +573,7 @@ public class XmlItem {
    * @return namespaceWrappedArray
   */
   
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -598,6 +592,7 @@ public class XmlItem {
    * @return prefixNsString
   */
   
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -616,6 +611,7 @@ public class XmlItem {
    * @return prefixNsNumber
   */
   
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -634,6 +630,7 @@ public class XmlItem {
    * @return prefixNsInteger
   */
   
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -652,6 +649,7 @@ public class XmlItem {
    * @return prefixNsBoolean
   */
   
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -678,6 +676,7 @@ public class XmlItem {
    * @return prefixNsArray
   */
   
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -704,6 +703,7 @@ public class XmlItem {
    * @return prefixNsWrappedArray
   */
   
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }

samples/client/petstore/spring-http-interface/.openapi-generator/FILES

@@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java
 src/main/java/org/openapitools/model/OuterEnumDto.java
 src/main/java/org/openapitools/model/PetDto.java
 src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
 src/main/java/org/openapitools/model/ReturnDto.java
 src/main/java/org/openapitools/model/SpecialModelNameDto.java
 src/main/java/org/openapitools/model/TagDto.java

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java

@@ -7,6 +7,7 @@ package org.openapitools.api;
 
 import org.openapitools.model.ApiResponseDto;
 import org.openapitools.model.PetDto;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto;
 import java.util.Set;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -118,6 +119,22 @@ public interface PetApi {
     );
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @HttpExchange(
+        method = "GET",
+        value = "/fake/{petId}/response-object-different-names",
+        accept = "application/json"
+    )
+    ResponseEntity<ResponseObjectWithDifferentFieldNamesDto> responseObjectDifferentNames(
+         @PathVariable("petId") Long petId
+    );
+
+
     /**
      * PUT /pet : Update an existing pet
      * 

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java

@@ -23,7 +23,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyTypeDto extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyTypeDto name(String name) {
@@ -36,6 +35,7 @@ public class AdditionalPropertiesAnyTypeDto extends HashMap<String, Object> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArrayDto extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArrayDto name(String name) {
@@ -37,6 +36,7 @@ public class AdditionalPropertiesArrayDto extends HashMap<String, List> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java

@@ -23,7 +23,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBooleanDto extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBooleanDto name(String name) {
@@ -36,6 +35,7 @@ public class AdditionalPropertiesBooleanDto extends HashMap<String, Boolean> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java

@@ -28,45 +28,34 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClassDto {
 
-  @JsonProperty("map_string")
   
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClassDto mapString(Map<String, String> mapString) {
@@ -87,6 +76,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapString
   */
   
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapNumber
   */
   
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -139,6 +130,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapInteger
   */
   
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -165,6 +157,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapBoolean
   */
   
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -191,6 +184,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapArrayInteger
   */
   
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -217,6 +211,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapArrayAnytype
   */
   
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -243,6 +238,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapMapString
   */
   
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -269,6 +265,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapMapAnytype
   */
   
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -287,6 +284,7 @@ public class AdditionalPropertiesClassDto {
    * @return anytype1
   */
   
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -305,6 +303,7 @@ public class AdditionalPropertiesClassDto {
    * @return anytype2
   */
   
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -323,6 +322,7 @@ public class AdditionalPropertiesClassDto {
    * @return anytype3
   */
   
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java

@@ -23,7 +23,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesIntegerDto extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesIntegerDto name(String name) {
@@ -36,6 +35,7 @@ public class AdditionalPropertiesIntegerDto extends HashMap<String, Integer> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumberDto extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumberDto name(String name) {
@@ -37,6 +36,7 @@ public class AdditionalPropertiesNumberDto extends HashMap<String, BigDecimal> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java

@@ -23,7 +23,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObjectDto extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObjectDto name(String name) {
@@ -36,6 +35,7 @@ public class AdditionalPropertiesObjectDto extends HashMap<String, Map> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java

@@ -23,7 +23,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesStringDto extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesStringDto name(String name) {
@@ -36,6 +35,7 @@ public class AdditionalPropertiesStringDto extends HashMap<String, String> {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java

@@ -37,10 +37,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AnimalDto {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   public AnimalDto className(String className) {
@@ -53,6 +51,7 @@ public class AnimalDto {
    * @return className
   */
   @NotNull
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -71,6 +70,7 @@ public class AnimalDto {
    * @return color
   */
   
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java

@@ -21,13 +21,10 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ApiResponseDto {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ApiResponseDto code(Integer code) {
@@ -40,6 +37,7 @@ public class ApiResponseDto {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -58,6 +56,7 @@ public class ApiResponseDto {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -76,6 +75,7 @@ public class ApiResponseDto {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayArrayNumber")
   
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -46,6 +45,7 @@ public class ArrayOfArrayOfNumberOnlyDto {
    * @return arrayArrayNumber
   */
   
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayNumber")
   
   private List<BigDecimal> arrayNumber;
 
@@ -46,6 +45,7 @@ public class ArrayOfNumberOnlyDto {
    * @return arrayNumber
   */
   
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java

@@ -24,15 +24,12 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTestDto {
 
-  @JsonProperty("array_of_string")
   
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   
   private List<List<ReadOnlyFirstDto>> arrayArrayOfModel;
 
@@ -54,6 +51,7 @@ public class ArrayTestDto {
    * @return arrayOfString
   */
   
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -80,6 +78,7 @@ public class ArrayTestDto {
    * @return arrayArrayOfInteger
   */
   
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -106,6 +105,7 @@ public class ArrayTestDto {
    * @return arrayArrayOfModel
   */
   
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirstDto>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java

@@ -61,7 +61,6 @@ public class BigCatAllOfDto {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOfDto kind(KindEnum kind) {
@@ -74,6 +73,7 @@ public class BigCatAllOfDto {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java

@@ -66,7 +66,6 @@ public class BigCatDto extends CatDto {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatDto kind(KindEnum kind) {
@@ -79,6 +78,7 @@ public class BigCatDto extends CatDto {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java

@@ -21,22 +21,16 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CapitalizationDto {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public CapitalizationDto smallCamel(String smallCamel) {
@@ -49,6 +43,7 @@ public class CapitalizationDto {
    * @return smallCamel
   */
   
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -67,6 +62,7 @@ public class CapitalizationDto {
    * @return capitalCamel
   */
   
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -85,6 +81,7 @@ public class CapitalizationDto {
    * @return smallSnake
   */
   
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -103,6 +100,7 @@ public class CapitalizationDto {
    * @return capitalSnake
   */
   
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -121,6 +119,7 @@ public class CapitalizationDto {
    * @return scAETHFlowPoints
   */
   
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -139,6 +138,7 @@ public class CapitalizationDto {
    * @return ATT_NAME
   */
   
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOfDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOfDto declawed(Boolean declawed) {
@@ -34,6 +33,7 @@ public class CatAllOfDto {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java

@@ -34,7 +34,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatDto extends AnimalDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatDto declawed(Boolean declawed) {
@@ -47,6 +46,7 @@ public class CatDto extends AnimalDto {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java

@@ -21,10 +21,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CategoryDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   public CategoryDto id(Long id) {
@@ -37,6 +35,7 @@ public class CategoryDto {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -55,6 +54,7 @@ public class CategoryDto {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModelDto {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModelDto propertyClass(String propertyClass) {
@@ -34,6 +33,7 @@ public class ClassModelDto {
    * @return propertyClass
   */
   
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClientDto {
 
-  @JsonProperty("client")
   private String client;
 
   public ClientDto client(String client) {
@@ -34,6 +33,7 @@ public class ClientDto {
    * @return client
   */
   
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java

@@ -26,19 +26,15 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValueDto {
 
-  @JsonProperty("nullable_array")
   
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -60,6 +56,7 @@ public class ContainerDefaultValueDto {
    * @return nullableArray
   */
   
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -86,6 +83,7 @@ public class ContainerDefaultValueDto {
    * @return nullableRequiredArray
   */
   @NotNull
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -112,6 +110,7 @@ public class ContainerDefaultValueDto {
    * @return requiredArray
   */
   @NotNull
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -138,6 +137,7 @@ public class ContainerDefaultValueDto {
    * @return nullableArrayWithDefault
   */
   
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOfDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOfDto breed(String breed) {
@@ -34,6 +33,7 @@ public class DogAllOfDto {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java

@@ -26,7 +26,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogDto extends AnimalDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogDto breed(String breed) {
@@ -39,6 +38,7 @@ public class DogDto extends AnimalDto {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java

@@ -59,7 +59,6 @@ public class EnumArraysDto {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public class EnumArraysDto {
     }
   }
 
-  @JsonProperty("array_enum")
   
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -111,6 +109,7 @@ public class EnumArraysDto {
    * @return justSymbol
   */
   
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -137,6 +136,7 @@ public class EnumArraysDto {
    * @return arrayEnum
   */
   
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java

@@ -60,7 +60,6 @@ public class EnumTestDto {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -100,7 +99,6 @@ public class EnumTestDto {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -138,7 +136,6 @@ public class EnumTestDto {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -176,10 +173,8 @@ public class EnumTestDto {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnumDto outerEnum;
 
   public EnumTestDto enumString(EnumStringEnum enumString) {
@@ -192,6 +187,7 @@ public class EnumTestDto {
    * @return enumString
   */
   
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -210,6 +206,7 @@ public class EnumTestDto {
    * @return enumStringRequired
   */
   @NotNull
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -228,6 +225,7 @@ public class EnumTestDto {
    * @return enumInteger
   */
   
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -246,6 +244,7 @@ public class EnumTestDto {
    * @return enumNumber
   */
   
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -264,6 +263,7 @@ public class EnumTestDto {
    * @return outerEnum
   */
   
+  @JsonProperty("outerEnum")
   public OuterEnumDto getOuterEnum() {
     return outerEnum;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileDto {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public FileDto sourceURI(String sourceURI) {
@@ -34,6 +33,7 @@ public class FileDto {
    * @return sourceURI
   */
   
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java

@@ -24,10 +24,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClassDto {
 
-  @JsonProperty("file")
   private FileDto file;
 
-  @JsonProperty("files")
   
   private List<FileDto> files;
 
@@ -41,6 +39,7 @@ public class FileSchemaTestClassDto {
    * @return file
   */
   
+  @JsonProperty("file")
   public FileDto getFile() {
     return file;
   }
@@ -67,6 +66,7 @@ public class FileSchemaTestClassDto {
    * @return files
   */
   
+  @JsonProperty("files")
   public List<FileDto> getFiles() {
     return files;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java

@@ -27,48 +27,34 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTestDto {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   public FormatTestDto integer(Integer integer) {
@@ -83,6 +69,7 @@ public class FormatTestDto {
    * @return integer
   */
   
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -103,6 +90,7 @@ public class FormatTestDto {
    * @return int32
   */
   
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -121,6 +109,7 @@ public class FormatTestDto {
    * @return int64
   */
   
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -141,6 +130,7 @@ public class FormatTestDto {
    * @return number
   */
   @NotNull
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -161,6 +151,7 @@ public class FormatTestDto {
    * @return _float
   */
   
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -181,6 +172,7 @@ public class FormatTestDto {
    * @return _double
   */
   
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -199,6 +191,7 @@ public class FormatTestDto {
    * @return string
   */
   
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -217,6 +210,7 @@ public class FormatTestDto {
    * @return _byte
   */
   @NotNull
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -235,6 +229,7 @@ public class FormatTestDto {
    * @return binary
   */
   
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -253,6 +248,7 @@ public class FormatTestDto {
    * @return date
   */
   @NotNull
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -271,6 +267,7 @@ public class FormatTestDto {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -289,6 +286,7 @@ public class FormatTestDto {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -307,6 +305,7 @@ public class FormatTestDto {
    * @return password
   */
   @NotNull
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -325,6 +324,7 @@ public class FormatTestDto {
    * @return bigDecimal
   */
   
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java

@@ -21,10 +21,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnlyDto {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnlyDto bar(String bar) {
@@ -37,6 +35,7 @@ public class HasOnlyReadOnlyDto {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -55,6 +54,7 @@ public class HasOnlyReadOnlyDto {
    * @return foo
   */
   
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }

samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java

@@ -21,7 +21,6 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ListDto {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ListDto _123list(String _123list) {
@@ -34,6 +33,7 @@ public class ListDto {
    * @return _123list
   */
   
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }