Merge remote-tracking branch 'origin/master' into 7.0.x

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

@@ -28,6 +28,7 @@ src/main/java/org/openapitools/model/CatDto.java
 src/main/java/org/openapitools/model/CategoryDto.java
 src/main/java/org/openapitools/model/ClassModelDto.java
 src/main/java/org/openapitools/model/ClientDto.java
+src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
 src/main/java/org/openapitools/model/DogAllOfDto.java
 src/main/java/org/openapitools/model/DogDto.java
 src/main/java/org/openapitools/model/EnumArraysDto.java
@@ -48,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/AnotherFakeApi.java

@@ -24,7 +24,7 @@ public interface AnotherFakeApi {
      * PATCH /another-fake/dummy : To test special tags
      * To test special tags and operation ID starting with number
      *
-     * @param body client model (required)
+     * @param clientDto client model (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
@@ -34,7 +34,7 @@ public interface AnotherFakeApi {
         contentType = "application/json"
     )
     ResponseEntity<ClientDto> call123testSpecialTags(
-         @RequestBody ClientDto body
+         @RequestBody ClientDto clientDto
     );
 
 }

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

@@ -33,7 +33,7 @@ public interface FakeApi {
      * POST /fake/create_xml_item : creates an XmlItem
      * this route creates an XmlItem
      *
-     * @param xmlItem XmlItem Body (required)
+     * @param xmlItemDto XmlItem Body (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
@@ -43,7 +43,7 @@ public interface FakeApi {
         contentType = "application/xml"
     )
     ResponseEntity<Void> createXmlItem(
-         @RequestBody XmlItemDto xmlItem
+         @RequestBody XmlItemDto xmlItemDto
     );
 
 
@@ -58,7 +58,7 @@ public interface FakeApi {
         method = "POST",
         value = "/fake/outer/boolean",
         accept = "*/*",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<Boolean> fakeOuterBooleanSerialize(
          @RequestBody(required = false) Boolean body
@@ -69,17 +69,17 @@ public interface FakeApi {
      * POST /fake/outer/composite
      * Test serialization of object with outer number type
      *
-     * @param body Input composite as post body (optional)
+     * @param outerCompositeDto Input composite as post body (optional)
      * @return Output composite (status code 200)
      */
     @HttpExchange(
         method = "POST",
         value = "/fake/outer/composite",
         accept = "*/*",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<OuterCompositeDto> fakeOuterCompositeSerialize(
-         @RequestBody(required = false) OuterCompositeDto body
+         @RequestBody(required = false) OuterCompositeDto outerCompositeDto
     );
 
 
@@ -94,7 +94,7 @@ public interface FakeApi {
         method = "POST",
         value = "/fake/outer/number",
         accept = "*/*",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<BigDecimal> fakeOuterNumberSerialize(
          @RequestBody(required = false) BigDecimal body
@@ -112,7 +112,7 @@ public interface FakeApi {
         method = "POST",
         value = "/fake/outer/string",
         accept = "*/*",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<String> fakeOuterStringSerialize(
          @RequestBody(required = false) String body
@@ -123,7 +123,7 @@ public interface FakeApi {
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
      *
-     * @param body  (required)
+     * @param fileSchemaTestClassDto  (required)
      * @return Success (status code 200)
      */
     @HttpExchange(
@@ -133,7 +133,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> testBodyWithFileSchema(
-         @RequestBody FileSchemaTestClassDto body
+         @RequestBody FileSchemaTestClassDto fileSchemaTestClassDto
     );
 
 
@@ -141,7 +141,7 @@ public interface FakeApi {
      * PUT /fake/body-with-query-params
      *
      * @param query  (required)
-     * @param body  (required)
+     * @param userDto  (required)
      * @return Success (status code 200)
      */
     @HttpExchange(
@@ -152,7 +152,7 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testBodyWithQueryParams(
          @RequestParam(value = "query", required = true) String query,
-         @RequestBody UserDto body
+         @RequestBody UserDto userDto
     );
 
 
@@ -160,7 +160,7 @@ public interface FakeApi {
      * PATCH /fake : To test \&quot;client\&quot; model
      * To test \&quot;client\&quot; model
      *
-     * @param body client model (required)
+     * @param clientDto client model (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
@@ -170,7 +170,7 @@ public interface FakeApi {
         contentType = "application/json"
     )
     ResponseEntity<ClientDto> testClientModel(
-         @RequestBody ClientDto body
+         @RequestBody ClientDto clientDto
     );
 
 
@@ -281,8 +281,9 @@ public interface FakeApi {
 
     /**
      * POST /fake/inline-additionalProperties : test inline additionalProperties
+     * 
      *
-     * @param param request body (required)
+     * @param requestBody request body (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
@@ -292,12 +293,13 @@ public interface FakeApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> testInlineAdditionalProperties(
-         @RequestBody Map<String, String> param
+         @RequestBody Map<String, String> requestBody
     );
 
 
     /**
      * GET /fake/jsonFormData : test json serialization of form data
+     * 
      *
      * @param param field1 (required)
      * @param param2 field2 (required)
@@ -320,7 +322,6 @@ public interface FakeApi {
      * To test the collection format in query parameters
      *
      * @param pipe  (required)
-     * @param ioutil  (required)
      * @param http  (required)
      * @param url  (required)
      * @param context  (required)
@@ -333,7 +334,6 @@ public interface FakeApi {
     )
     ResponseEntity<Void> testQueryParameterCollectionFormat(
          @RequestParam(value = "pipe", required = true) List<String> pipe,
-         @RequestParam(value = "ioutil", required = true) List<String> ioutil,
          @RequestParam(value = "http", required = true) List<String> http,
          @RequestParam(value = "url", required = true) List<String> url,
          @RequestParam(value = "context", required = true) List<String> context

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

@@ -24,7 +24,7 @@ public interface FakeClassnameTags123Api {
      * PATCH /fake_classname_test : To test class name in snake case
      * To test class name in snake case
      *
-     * @param body client model (required)
+     * @param clientDto client model (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
@@ -34,7 +34,7 @@ public interface FakeClassnameTags123Api {
         contentType = "application/json"
     )
     ResponseEntity<ClientDto> testClassname(
-         @RequestBody ClientDto body
+         @RequestBody ClientDto clientDto
     );
 
 }

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.*;
@@ -24,8 +25,9 @@ public interface PetApi {
 
     /**
      * POST /pet : Add a new pet to the store
+     * 
      *
-     * @param body Pet object that needs to be added to the store (required)
+     * @param petDto Pet object that needs to be added to the store (required)
      * @return successful operation (status code 200)
      *         or Invalid input (status code 405)
      */
@@ -36,12 +38,13 @@ public interface PetApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> addPet(
-         @RequestBody PetDto body
+         @RequestBody PetDto petDto
     );
 
 
     /**
      * DELETE /pet/{petId} : Deletes a pet
+     * 
      *
      * @param petId Pet id to delete (required)
      * @param apiKey  (optional)
@@ -117,9 +120,26 @@ public interface PetApi {
 
 
     /**
-     * PUT /pet : Update an existing pet
+     * GET /fake/{petId}/response-object-different-names
      *
-     * @param body Pet object that needs to be added to the store (required)
+     * @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
+     * 
+     *
+     * @param petDto Pet object that needs to be added to the store (required)
      * @return successful operation (status code 200)
      *         or Invalid ID supplied (status code 400)
      *         or Pet not found (status code 404)
@@ -132,12 +152,13 @@ public interface PetApi {
         contentType = "application/json"
     )
     ResponseEntity<Void> updatePet(
-         @RequestBody PetDto body
+         @RequestBody PetDto petDto
     );
 
 
     /**
      * POST /pet/{petId} : Updates a pet in the store with form data
+     * 
      *
      * @param petId ID of pet that needs to be updated (required)
      * @param name Updated name of the pet (optional)
@@ -159,6 +180,7 @@ public interface PetApi {
 
     /**
      * POST /pet/{petId}/uploadImage : uploads an image
+     * 
      *
      * @param petId ID of pet to update (required)
      * @param additionalMetadata Additional data to pass to server (optional)
@@ -180,6 +202,7 @@ public interface PetApi {
 
     /**
      * POST /fake/{petId}/uploadImageWithRequiredFile : uploads an image (required)
+     * 
      *
      * @param petId ID of pet to update (required)
      * @param requiredFile file to upload (required)

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

@@ -76,8 +76,9 @@ public interface StoreApi {
 
     /**
      * POST /store/order : Place an order for a pet
+     * 
      *
-     * @param body order placed for purchasing the pet (required)
+     * @param orderDto order placed for purchasing the pet (required)
      * @return successful operation (status code 200)
      *         or Invalid Order (status code 400)
      */
@@ -85,10 +86,10 @@ public interface StoreApi {
         method = "POST",
         value = "/store/order",
         accept = "application/json",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<OrderDto> placeOrder(
-         @RequestBody OrderDto body
+         @RequestBody OrderDto orderDto
     );
 
 }

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

@@ -26,51 +26,53 @@ public interface UserApi {
      * POST /user : Create user
      * This can only be done by the logged in user.
      *
-     * @param body Created user object (required)
+     * @param userDto Created user object (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
         method = "POST",
         value = "/user",
         accept = "application/json",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<Void> createUser(
-         @RequestBody UserDto body
+         @RequestBody UserDto userDto
     );
 
 
     /**
      * POST /user/createWithArray : Creates list of users with given input array
+     * 
      *
-     * @param body List of user object (required)
+     * @param userDto List of user object (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
         method = "POST",
         value = "/user/createWithArray",
         accept = "application/json",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<Void> createUsersWithArrayInput(
-         @RequestBody List<UserDto> body
+         @RequestBody List<UserDto> userDto
     );
 
 
     /**
      * POST /user/createWithList : Creates list of users with given input array
+     * 
      *
-     * @param body List of user object (required)
+     * @param userDto List of user object (required)
      * @return successful operation (status code 200)
      */
     @HttpExchange(
         method = "POST",
         value = "/user/createWithList",
         accept = "application/json",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<Void> createUsersWithListInput(
-         @RequestBody List<UserDto> body
+         @RequestBody List<UserDto> userDto
     );
 
 
@@ -94,6 +96,7 @@ public interface UserApi {
 
     /**
      * GET /user/{username} : Get user by user name
+     * 
      *
      * @param username The name that needs to be fetched. Use user1 for testing. (required)
      * @return successful operation (status code 200)
@@ -112,6 +115,7 @@ public interface UserApi {
 
     /**
      * GET /user/login : Logs user into the system
+     * 
      *
      * @param username The user name for login (required)
      * @param password The password for login in clear text (required)
@@ -131,6 +135,7 @@ public interface UserApi {
 
     /**
      * GET /user/logout : Logs out current logged in user session
+     * 
      *
      * @return successful operation (status code 200)
      */
@@ -149,7 +154,7 @@ public interface UserApi {
      * This can only be done by the logged in user.
      *
      * @param username name that need to be deleted (required)
-     * @param body Updated user object (required)
+     * @param userDto Updated user object (required)
      * @return Invalid user supplied (status code 400)
      *         or User not found (status code 404)
      */
@@ -157,11 +162,11 @@ public interface UserApi {
         method = "PUT",
         value = "/user/{username}",
         accept = "application/json",
-        contentType = "*/*"
+        contentType = "application/json"
     )
     ResponseEntity<Void> updateUser(
          @PathVariable("username") String username,
-         @RequestBody UserDto body
+         @RequestBody UserDto userDto
     );
 
 }

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

@@ -6,10 +6,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.NoSuchElementException;
+import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.NotNull;
 
@@ -25,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 = null;
+  private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   
-  private Map<String, BigDecimal> mapNumber = null;
+  private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   
-  private Map<String, Integer> mapInteger = null;
+  private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   
-  private Map<String, Boolean> mapBoolean = null;
+  private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   
-  private Map<String, List<Integer>> mapArrayInteger = null;
+  private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   
-  private Map<String, List<Object>> mapArrayAnytype = null;
+  private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   
-  private Map<String, Map<String, String>> mapMapString = null;
+  private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   
-  private Map<String, Map<String, Object>> mapMapAnytype = null;
+  private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
-  private Object anytype2;
+  private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClassDto mapString(Map<String, String> mapString) {
@@ -84,6 +76,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapString
   */
   
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -110,6 +103,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapNumber
   */
   
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -136,6 +130,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapInteger
   */
   
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -162,6 +157,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapBoolean
   */
   
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -188,6 +184,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapArrayInteger
   */
   
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -214,6 +211,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapArrayAnytype
   */
   
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -240,6 +238,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapMapString
   */
   
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -266,6 +265,7 @@ public class AdditionalPropertiesClassDto {
    * @return mapMapAnytype
   */
   
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -284,6 +284,7 @@ public class AdditionalPropertiesClassDto {
    * @return anytype1
   */
   
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -293,7 +294,7 @@ public class AdditionalPropertiesClassDto {
   }
 
   public AdditionalPropertiesClassDto anytype2(Object anytype2) {
-    this.anytype2 = anytype2;
+    this.anytype2 = JsonNullable.of(anytype2);
     return this;
   }
 
@@ -302,11 +303,12 @@ public class AdditionalPropertiesClassDto {
    * @return anytype2
   */
   
-  public Object getAnytype2() {
+  @JsonProperty("anytype_2")
+  public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
 
-  public void setAnytype2(Object anytype2) {
+  public void setAnytype2(JsonNullable<Object> anytype2) {
     this.anytype2 = anytype2;
   }
 
@@ -320,6 +322,7 @@ public class AdditionalPropertiesClassDto {
    * @return anytype3
   */
   
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
@@ -346,13 +349,24 @@ public class AdditionalPropertiesClassDto {
         Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
         Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
         Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        equalsNullable(this.anytype2, additionalPropertiesClass.anytype2) &&
         Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
   }
 
+  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
+    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
+  }
+
   @Override
   public int hashCode() {
-    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, hashCodeNullable(anytype2), anytype3);
+  }
+
+  private static <T> int hashCodeNullable(JsonNullable<T> a) {
+    if (a == null) {
+      return 1;
+    }
+    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
   }
 
   @Override

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

@@ -8,9 +8,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.openapitools.model.BigCatDto;
-import org.openapitools.model.CatDto;
-import org.openapitools.model.DogDto;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.NotNull;
@@ -37,28 +34,10 @@ 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";
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link AnimalDto#AnimalDto(String)}
-   */
-  @Deprecated
-  public AnimalDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public AnimalDto(String className) {
-    this.className = className;
-  }
-
   public AnimalDto className(String className) {
     this.className = className;
     return this;
@@ -69,6 +48,7 @@ public class AnimalDto {
    * @return className
   */
   @NotNull
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -87,6 +67,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,9 +24,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayArrayNumber")
   
-  private List<List<BigDecimal>> arrayArrayNumber = null;
+  private List<List<BigDecimal>> arrayArrayNumber;
 
   public ArrayOfArrayOfNumberOnlyDto arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = 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,9 +24,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayNumber")
   
-  private List<BigDecimal> arrayNumber = null;
+  private List<BigDecimal> arrayNumber;
 
   public ArrayOfNumberOnlyDto arrayNumber(List<BigDecimal> arrayNumber) {
     this.arrayNumber = 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,17 +24,14 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTestDto {
 
-  @JsonProperty("array_of_string")
   
-  private List<String> arrayOfString = null;
+  private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   
-  private List<List<Long>> arrayArrayOfInteger = null;
+  private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   
-  private List<List<ReadOnlyFirstDto>> arrayArrayOfModel = null;
+  private List<List<ReadOnlyFirstDto>> arrayArrayOfModel;
 
   public ArrayTestDto arrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
@@ -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,25 +66,8 @@ public class BigCatDto extends CatDto {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link BigCatDto#BigCatDto(String)}
-   */
-  @Deprecated
-  public BigCatDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public BigCatDto(String className) {
-    super(className);
-  }
-
   public BigCatDto kind(KindEnum kind) {
     this.kind = kind;
     return this;
@@ -95,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

@@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.openapitools.model.AnimalDto;
-import org.openapitools.model.BigCatDto;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.NotNull;
@@ -34,25 +33,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatDto extends AnimalDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link CatDto#CatDto(String)}
-   */
-  @Deprecated
-  public CatDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public CatDto(String className) {
-    super(className);
-  }
-
   public CatDto declawed(Boolean declawed) {
     this.declawed = declawed;
     return this;
@@ -63,6 +45,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,28 +21,10 @@ 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";
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link CategoryDto#CategoryDto(String)}
-   */
-  @Deprecated
-  public CategoryDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public CategoryDto(String name) {
-    this.name = name;
-  }
-
   public CategoryDto id(Long id) {
     this.id = id;
     return this;
@@ -53,6 +35,7 @@ public class CategoryDto {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -71,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

@@ -0,0 +1,203 @@
+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 com.fasterxml.jackson.annotation.JsonTypeName;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.util.NoSuchElementException;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.constraints.NotNull;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ContainerDefaultValueDto
+ */
+
+@JsonTypeName("ContainerDefaultValue")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ContainerDefaultValueDto {
+
+  
+  private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
+
+  
+  private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
+
+  
+  private List<String> requiredArray = new ArrayList<>();
+
+  
+  private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
+
+  public ContainerDefaultValueDto nullableArray(List<String> nullableArray) {
+    this.nullableArray = JsonNullable.of(nullableArray);
+    return this;
+  }
+
+  public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) {
+    if (this.nullableArray == null || !this.nullableArray.isPresent()) {
+      this.nullableArray = JsonNullable.of(new ArrayList<>());
+    }
+    this.nullableArray.get().add(nullableArrayItem);
+    return this;
+  }
+
+  /**
+   * Get nullableArray
+   * @return nullableArray
+  */
+  
+  @JsonProperty("nullable_array")
+  public JsonNullable<List<String>> getNullableArray() {
+    return nullableArray;
+  }
+
+  public void setNullableArray(JsonNullable<List<String>> nullableArray) {
+    this.nullableArray = nullableArray;
+  }
+
+  public ContainerDefaultValueDto nullableRequiredArray(List<String> nullableRequiredArray) {
+    this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray);
+    return this;
+  }
+
+  public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequiredArrayItem) {
+    if (this.nullableRequiredArray == null || !this.nullableRequiredArray.isPresent()) {
+      this.nullableRequiredArray = JsonNullable.of(new ArrayList<>());
+    }
+    this.nullableRequiredArray.get().add(nullableRequiredArrayItem);
+    return this;
+  }
+
+  /**
+   * Get nullableRequiredArray
+   * @return nullableRequiredArray
+  */
+  @NotNull
+  @JsonProperty("nullable_required_array")
+  public JsonNullable<List<String>> getNullableRequiredArray() {
+    return nullableRequiredArray;
+  }
+
+  public void setNullableRequiredArray(JsonNullable<List<String>> nullableRequiredArray) {
+    this.nullableRequiredArray = nullableRequiredArray;
+  }
+
+  public ContainerDefaultValueDto requiredArray(List<String> requiredArray) {
+    this.requiredArray = requiredArray;
+    return this;
+  }
+
+  public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) {
+    if (this.requiredArray == null) {
+      this.requiredArray = new ArrayList<>();
+    }
+    this.requiredArray.add(requiredArrayItem);
+    return this;
+  }
+
+  /**
+   * Get requiredArray
+   * @return requiredArray
+  */
+  @NotNull
+  @JsonProperty("required_array")
+  public List<String> getRequiredArray() {
+    return requiredArray;
+  }
+
+  public void setRequiredArray(List<String> requiredArray) {
+    this.requiredArray = requiredArray;
+  }
+
+  public ContainerDefaultValueDto nullableArrayWithDefault(List<String> nullableArrayWithDefault) {
+    this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault);
+    return this;
+  }
+
+  public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableArrayWithDefaultItem) {
+    if (this.nullableArrayWithDefault == null || !this.nullableArrayWithDefault.isPresent()) {
+      this.nullableArrayWithDefault = JsonNullable.of(new ArrayList<>(Arrays.asList("foo", "bar")));
+    }
+    this.nullableArrayWithDefault.get().add(nullableArrayWithDefaultItem);
+    return this;
+  }
+
+  /**
+   * Get nullableArrayWithDefault
+   * @return nullableArrayWithDefault
+  */
+  
+  @JsonProperty("nullable_array_with_default")
+  public JsonNullable<List<String>> getNullableArrayWithDefault() {
+    return nullableArrayWithDefault;
+  }
+
+  public void setNullableArrayWithDefault(JsonNullable<List<String>> nullableArrayWithDefault) {
+    this.nullableArrayWithDefault = nullableArrayWithDefault;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ContainerDefaultValueDto containerDefaultValue = (ContainerDefaultValueDto) o;
+    return equalsNullable(this.nullableArray, containerDefaultValue.nullableArray) &&
+        Objects.equals(this.nullableRequiredArray, containerDefaultValue.nullableRequiredArray) &&
+        Objects.equals(this.requiredArray, containerDefaultValue.requiredArray) &&
+        equalsNullable(this.nullableArrayWithDefault, containerDefaultValue.nullableArrayWithDefault);
+  }
+
+  private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
+    return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get()));
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(hashCodeNullable(nullableArray), nullableRequiredArray, requiredArray, hashCodeNullable(nullableArrayWithDefault));
+  }
+
+  private static <T> int hashCodeNullable(JsonNullable<T> a) {
+    if (a == null) {
+      return 1;
+    }
+    return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31;
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ContainerDefaultValueDto {\n");
+    sb.append("    nullableArray: ").append(toIndentedString(nullableArray)).append("\n");
+    sb.append("    nullableRequiredArray: ").append(toIndentedString(nullableRequiredArray)).append("\n");
+    sb.append("    requiredArray: ").append(toIndentedString(requiredArray)).append("\n");
+    sb.append("    nullableArrayWithDefault: ").append(toIndentedString(nullableArrayWithDefault)).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/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,25 +26,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogDto extends AnimalDto {
 
-  @JsonProperty("breed")
   private String breed;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link DogDto#DogDto(String)}
-   */
-  @Deprecated
-  public DogDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public DogDto(String className) {
-    super(className);
-  }
-
   public DogDto breed(String breed) {
     this.breed = breed;
     return this;
@@ -55,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,9 +96,8 @@ public class EnumArraysDto {
     }
   }
 
-  @JsonProperty("array_enum")
   
-  private List<ArrayEnumEnum> arrayEnum = null;
+  private List<ArrayEnumEnum> arrayEnum;
 
   public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
@@ -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,28 +173,10 @@ public class EnumTestDto {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnumDto outerEnum;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link EnumTestDto#EnumTestDto(EnumStringRequiredEnum)}
-   */
-  @Deprecated
-  public EnumTestDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public EnumTestDto(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
   public EnumTestDto enumString(EnumStringEnum enumString) {
     this.enumString = enumString;
     return this;
@@ -208,6 +187,7 @@ public class EnumTestDto {
    * @return enumString
   */
   
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -226,6 +206,7 @@ public class EnumTestDto {
    * @return enumStringRequired
   */
   @NotNull
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -244,6 +225,7 @@ public class EnumTestDto {
    * @return enumInteger
   */
   
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -262,6 +244,7 @@ public class EnumTestDto {
    * @return enumNumber
   */
   
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -280,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,12 +24,10 @@ 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 = null;
+  private List<FileDto> files;
 
   public FileSchemaTestClassDto file(FileDto file) {
     this.file = file;
@@ -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,69 +27,36 @@ 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;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link FormatTestDto#FormatTestDto(BigDecimal, byte[], LocalDate, String)}
-   */
-  @Deprecated
-  public FormatTestDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate date, String password) {
-    this.number = number;
-    this._byte = _byte;
-    this.date = date;
-    this.password = password;
-  }
-
   public FormatTestDto integer(Integer integer) {
     this.integer = integer;
     return this;
@@ -102,6 +69,7 @@ public class FormatTestDto {
    * @return integer
   */
   
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -122,6 +90,7 @@ public class FormatTestDto {
    * @return int32
   */
   
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -140,6 +109,7 @@ public class FormatTestDto {
    * @return int64
   */
   
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -160,6 +130,7 @@ public class FormatTestDto {
    * @return number
   */
   @NotNull
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -180,6 +151,7 @@ public class FormatTestDto {
    * @return _float
   */
   
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -200,6 +172,7 @@ public class FormatTestDto {
    * @return _double
   */
   
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -218,6 +191,7 @@ public class FormatTestDto {
    * @return string
   */
   
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -236,6 +210,7 @@ public class FormatTestDto {
    * @return _byte
   */
   @NotNull
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -254,6 +229,7 @@ public class FormatTestDto {
    * @return binary
   */
   
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -272,6 +248,7 @@ public class FormatTestDto {
    * @return date
   */
   @NotNull
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -290,6 +267,7 @@ public class FormatTestDto {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -308,6 +286,7 @@ public class FormatTestDto {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -326,6 +305,7 @@ public class FormatTestDto {
    * @return password
   */
   @NotNull
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -344,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;
   }

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

@@ -24,9 +24,8 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTestDto {
 
-  @JsonProperty("map_map_of_string")
   
-  private Map<String, Map<String, String>> mapMapOfString = null;
+  private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
   /**
    * Gets or Sets inner
@@ -63,17 +62,14 @@ public class MapTestDto {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   
-  private Map<String, InnerEnum> mapOfEnumString = null;
+  private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   
-  private Map<String, Boolean> directMap = null;
+  private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   
-  private Map<String, Boolean> indirectMap = null;
+  private Map<String, Boolean> indirectMap = new HashMap<>();
 
   public MapTestDto mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
@@ -93,6 +89,7 @@ public class MapTestDto {
    * @return mapMapOfString
   */
   
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -119,6 +116,7 @@ public class MapTestDto {
    * @return mapOfEnumString
   */
   
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -145,6 +143,7 @@ public class MapTestDto {
    * @return directMap
   */
   
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -171,6 +170,7 @@ public class MapTestDto {
    * @return indirectMap
   */
   
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }

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

@@ -27,16 +27,13 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClassDto {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   
-  private Map<String, AnimalDto> map = null;
+  private Map<String, AnimalDto> map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
     this.uuid = uuid;
@@ -48,6 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -66,6 +64,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -92,6 +91,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassDto {
    * @return map
   */
   
+  @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
     return map;
   }

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

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

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

@@ -21,34 +21,14 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NameDto {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link NameDto#NameDto(Integer)}
-   */
-  @Deprecated
-  public NameDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public NameDto(Integer name) {
-    this.name = name;
-  }
-
   public NameDto name(Integer name) {
     this.name = name;
     return this;
@@ -59,6 +39,7 @@ public class NameDto {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -77,6 +58,7 @@ public class NameDto {
    * @return snakeCase
   */
   
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -95,6 +77,7 @@ public class NameDto {
    * @return property
   */
   
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -113,6 +96,7 @@ public class NameDto {
    * @return _123number
   */
   
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }

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

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

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

@@ -24,16 +24,12 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OrderDto {
 
-  @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;
 
@@ -74,10 +70,8 @@ public class OrderDto {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public OrderDto id(Long id) {
@@ -90,6 +84,7 @@ public class OrderDto {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -108,6 +103,7 @@ public class OrderDto {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -126,6 +122,7 @@ public class OrderDto {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -144,6 +141,7 @@ public class OrderDto {
    * @return shipDate
   */
   
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -162,6 +160,7 @@ public class OrderDto {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -180,6 +179,7 @@ public class OrderDto {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }

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

@@ -22,13 +22,10 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterCompositeDto {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterCompositeDto myNumber(BigDecimal myNumber) {
@@ -41,6 +38,7 @@ public class OuterCompositeDto {
    * @return myNumber
   */
   
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -59,6 +57,7 @@ public class OuterCompositeDto {
    * @return myString
   */
   
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -77,6 +76,7 @@ public class OuterCompositeDto {
    * @return myBoolean
   */
   
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }

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

@@ -29,22 +29,17 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class PetDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private CategoryDto category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   
-  private List<TagDto> tags = null;
+  private List<TagDto> tags;
 
   /**
    * pet status in the store
@@ -83,26 +78,8 @@ public class PetDto {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link PetDto#PetDto(String, Set<String>)}
-   */
-  @Deprecated
-  public PetDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public PetDto(String name, Set<String> photoUrls) {
-    this.name = name;
-    this.photoUrls = photoUrls;
-  }
-
   public PetDto id(Long id) {
     this.id = id;
     return this;
@@ -113,6 +90,7 @@ public class PetDto {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +109,7 @@ public class PetDto {
    * @return category
   */
   
+  @JsonProperty("category")
   public CategoryDto getCategory() {
     return category;
   }
@@ -149,6 +128,7 @@ public class PetDto {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -163,6 +143,9 @@ public class PetDto {
   }
 
   public PetDto addPhotoUrlsItem(String photoUrlsItem) {
+    if (this.photoUrls == null) {
+      this.photoUrls = new LinkedHashSet<>();
+    }
     this.photoUrls.add(photoUrlsItem);
     return this;
   }
@@ -172,6 +155,7 @@ public class PetDto {
    * @return photoUrls
   */
   @NotNull
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -199,6 +183,7 @@ public class PetDto {
    * @return tags
   */
   
+  @JsonProperty("tags")
   public List<TagDto> getTags() {
     return tags;
   }
@@ -217,6 +202,7 @@ public class PetDto {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }

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

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

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

@@ -0,0 +1,151 @@
+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 com.fasterxml.jackson.annotation.JsonTypeName;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.constraints.NotNull;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNamesDto
+ */
+
+@JsonTypeName("ResponseObjectWithDifferentFieldNames")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNamesDto {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNamesDto 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 ResponseObjectWithDifferentFieldNamesDto 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 ResponseObjectWithDifferentFieldNamesDto 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 ResponseObjectWithDifferentFieldNamesDto 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;
+    }
+    ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) 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 ResponseObjectWithDifferentFieldNamesDto {\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/src/main/java/org/openapitools/model/ReturnDto.java

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

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

@@ -17,11 +17,10 @@ import jakarta.annotation.Generated;
  * SpecialModelNameDto
  */
 
-@JsonTypeName("$special[model.name]")
+@JsonTypeName("_special_model.name_")
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelNameDto {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelNameDto $specialPropertyName(Long $specialPropertyName) {
@@ -34,6 +33,7 @@ public class SpecialModelNameDto {
    * @return $specialPropertyName
   */
   
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
@@ -50,8 +50,8 @@ public class SpecialModelNameDto {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    SpecialModelNameDto $specialModelName = (SpecialModelNameDto) o;
-    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
+    SpecialModelNameDto specialModelName = (SpecialModelNameDto) o;
+    return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName);
   }
 
   @Override

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

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

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

@@ -24,41 +24,16 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefaultDto {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
-  private BigDecimal numberItem;
+  private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
-  private Integer integerItem;
+  private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   
-  private List<Integer> arrayItem = new ArrayList<>();
-
-  /**
-   * Default constructor
-   * @deprecated Use {@link TypeHolderDefaultDto#TypeHolderDefaultDto(String, BigDecimal, Integer, Boolean, List<Integer>)}
-   */
-  @Deprecated
-  public TypeHolderDefaultDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public TypeHolderDefaultDto(String stringItem, BigDecimal numberItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
-    this.stringItem = stringItem;
-    this.numberItem = numberItem;
-    this.integerItem = integerItem;
-    this.boolItem = boolItem;
-    this.arrayItem = arrayItem;
-  }
+  private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
   public TypeHolderDefaultDto stringItem(String stringItem) {
     this.stringItem = stringItem;
@@ -70,6 +45,7 @@ public class TypeHolderDefaultDto {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -88,6 +64,7 @@ public class TypeHolderDefaultDto {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -106,6 +83,7 @@ public class TypeHolderDefaultDto {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -124,6 +102,7 @@ public class TypeHolderDefaultDto {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -138,6 +117,9 @@ public class TypeHolderDefaultDto {
   }
 
   public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) {
+    if (this.arrayItem == null) {
+      this.arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
+    }
     this.arrayItem.add(arrayItemItem);
     return this;
   }
@@ -147,6 +129,7 @@ public class TypeHolderDefaultDto {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }

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

@@ -24,46 +24,19 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExampleDto {
 
-  @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<>();
 
-  /**
-   * Default constructor
-   * @deprecated Use {@link TypeHolderExampleDto#TypeHolderExampleDto(String, BigDecimal, Float, Integer, Boolean, List<Integer>)}
-   */
-  @Deprecated
-  public TypeHolderExampleDto() {
-    super();
-  }
-
-  /**
-   * Constructor with only required parameters
-   */
-  public TypeHolderExampleDto(String stringItem, BigDecimal numberItem, Float floatItem, Integer integerItem, Boolean boolItem, List<Integer> arrayItem) {
-    this.stringItem = stringItem;
-    this.numberItem = numberItem;
-    this.floatItem = floatItem;
-    this.integerItem = integerItem;
-    this.boolItem = boolItem;
-    this.arrayItem = arrayItem;
-  }
-
   public TypeHolderExampleDto stringItem(String stringItem) {
     this.stringItem = stringItem;
     return this;
@@ -74,6 +47,7 @@ public class TypeHolderExampleDto {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -92,6 +66,7 @@ public class TypeHolderExampleDto {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +85,7 @@ public class TypeHolderExampleDto {
    * @return floatItem
   */
   @NotNull
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -128,6 +104,7 @@ public class TypeHolderExampleDto {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -146,6 +123,7 @@ public class TypeHolderExampleDto {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -160,6 +138,9 @@ public class TypeHolderExampleDto {
   }
 
   public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) {
+    if (this.arrayItem == null) {
+      this.arrayItem = new ArrayList<>();
+    }
     this.arrayItem.add(arrayItemItem);
     return this;
   }
@@ -169,6 +150,7 @@ public class TypeHolderExampleDto {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }

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

@@ -21,28 +21,20 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class UserDto {
 
-  @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 UserDto id(Long id) {
@@ -55,6 +47,7 @@ public class UserDto {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +66,7 @@ public class UserDto {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -91,6 +85,7 @@ public class UserDto {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -109,6 +104,7 @@ public class UserDto {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -127,6 +123,7 @@ public class UserDto {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -145,6 +142,7 @@ public class UserDto {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -163,6 +161,7 @@ public class UserDto {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -181,6 +180,7 @@ public class UserDto {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }

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

@@ -24,101 +24,72 @@ import jakarta.annotation.Generated;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItemDto {
 
-  @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 = null;
+  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 = null;
+  private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   
-  private List<Integer> nameWrappedArray = null;
+  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 = null;
+  private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   
-  private List<Integer> prefixWrappedArray = null;
+  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 = null;
+  private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   
-  private List<Integer> namespaceWrappedArray = null;
+  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 = null;
+  private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   
-  private List<Integer> prefixNsWrappedArray = null;
+  private List<Integer> prefixNsWrappedArray;
 
   public XmlItemDto attributeString(String attributeString) {
     this.attributeString = attributeString;
@@ -130,6 +101,7 @@ public class XmlItemDto {
    * @return attributeString
   */
   
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -148,6 +120,7 @@ public class XmlItemDto {
    * @return attributeNumber
   */
   
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -166,6 +139,7 @@ public class XmlItemDto {
    * @return attributeInteger
   */
   
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -184,6 +158,7 @@ public class XmlItemDto {
    * @return attributeBoolean
   */
   
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -210,6 +185,7 @@ public class XmlItemDto {
    * @return wrappedArray
   */
   
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -228,6 +204,7 @@ public class XmlItemDto {
    * @return nameString
   */
   
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -246,6 +223,7 @@ public class XmlItemDto {
    * @return nameNumber
   */
   
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -264,6 +242,7 @@ public class XmlItemDto {
    * @return nameInteger
   */
   
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -282,6 +261,7 @@ public class XmlItemDto {
    * @return nameBoolean
   */
   
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -308,6 +288,7 @@ public class XmlItemDto {
    * @return nameArray
   */
   
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -334,6 +315,7 @@ public class XmlItemDto {
    * @return nameWrappedArray
   */
   
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -352,6 +334,7 @@ public class XmlItemDto {
    * @return prefixString
   */
   
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -370,6 +353,7 @@ public class XmlItemDto {
    * @return prefixNumber
   */
   
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -388,6 +372,7 @@ public class XmlItemDto {
    * @return prefixInteger
   */
   
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -406,6 +391,7 @@ public class XmlItemDto {
    * @return prefixBoolean
   */
   
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -432,6 +418,7 @@ public class XmlItemDto {
    * @return prefixArray
   */
   
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -458,6 +445,7 @@ public class XmlItemDto {
    * @return prefixWrappedArray
   */
   
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -476,6 +464,7 @@ public class XmlItemDto {
    * @return namespaceString
   */
   
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -494,6 +483,7 @@ public class XmlItemDto {
    * @return namespaceNumber
   */
   
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -512,6 +502,7 @@ public class XmlItemDto {
    * @return namespaceInteger
   */
   
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -530,6 +521,7 @@ public class XmlItemDto {
    * @return namespaceBoolean
   */
   
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -556,6 +548,7 @@ public class XmlItemDto {
    * @return namespaceArray
   */
   
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -582,6 +575,7 @@ public class XmlItemDto {
    * @return namespaceWrappedArray
   */
   
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -600,6 +594,7 @@ public class XmlItemDto {
    * @return prefixNsString
   */
   
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -618,6 +613,7 @@ public class XmlItemDto {
    * @return prefixNsNumber
   */
   
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -636,6 +632,7 @@ public class XmlItemDto {
    * @return prefixNsInteger
   */
   
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -654,6 +651,7 @@ public class XmlItemDto {
    * @return prefixNsBoolean
   */
   
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -680,6 +678,7 @@ public class XmlItemDto {
    * @return prefixNsArray
   */
   
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -706,6 +705,7 @@ public class XmlItemDto {
    * @return prefixNsWrappedArray
   */
   
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }