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

* 5705: Move JsonProperty annotation to the getters * Regenerate samples * Add jackson check * Add test * Minor fix * Fix test * Fix version * [Java][Spring] update test & samples; add serialization/deserialization test --------- Co-authored-by: Oleh Kurpiak <oleh.kurpiak@gmail.com>
2025-12-11 18:22:43 +00:00 · 2023-03-19 12:59:48 +01:00
parent 162623e49b
commit 6e649af9a7
1067 changed files with 6984 additions and 3468 deletions
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {

-  @JsonProperty("map_string")
  @Valid
  private Map<String, String> mapString = new HashMap<>();

-  @JsonProperty("map_number")
  @Valid
  private Map<String, BigDecimal> mapNumber = new HashMap<>();

-  @JsonProperty("map_integer")
  @Valid
  private Map<String, Integer> mapInteger = new HashMap<>();

-  @JsonProperty("map_boolean")
  @Valid
  private Map<String, Boolean> mapBoolean = new HashMap<>();

-  @JsonProperty("map_array_integer")
  @Valid
  private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();

-  @JsonProperty("map_array_anytype")
  @Valid
  private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();

-  @JsonProperty("map_map_string")
  @Valid
  private Map<String, Map<String, String>> mapMapString = new HashMap<>();

-  @JsonProperty("map_map_anytype")
  @Valid
  private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();

-  @JsonProperty("anytype_1")
  private Object anytype1;

-  @JsonProperty("anytype_2")
  private Object anytype2;

-  @JsonProperty("anytype_3")
  private Object anytype3;

  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -86,6 +75,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
  public Map<String, String> getMapString() {
    return mapString;
  }
@@ -113,6 +103,7 @@ public class AdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
  public Map<String, BigDecimal> getMapNumber() {
    return mapNumber;
  }
@@ -140,6 +131,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
  public Map<String, Integer> getMapInteger() {
    return mapInteger;
  }
@@ -167,6 +159,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
  public Map<String, Boolean> getMapBoolean() {
    return mapBoolean;
  }
@@ -194,6 +187,7 @@ public class AdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
  public Map<String, List<Integer>> getMapArrayInteger() {
    return mapArrayInteger;
  }
@@ -221,6 +215,7 @@ public class AdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
  public Map<String, List<Object>> getMapArrayAnytype() {
    return mapArrayAnytype;
  }
@@ -248,6 +243,7 @@ public class AdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
  public Map<String, Map<String, String>> getMapMapString() {
    return mapMapString;
  }
@@ -275,6 +271,7 @@ public class AdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
  public Map<String, Map<String, Object>> getMapMapAnytype() {
    return mapMapAnytype;
  }
@@ -294,6 +291,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
  public Object getAnytype1() {
    return anytype1;
  }
@@ -313,6 +311,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
  public Object getAnytype2() {
    return anytype2;
  }
@@ -332,6 +331,7 @@ public class AdditionalPropertiesClass {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {

-  @JsonProperty("name")
  private String name;

  public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -37,10 +37,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {

-  @JsonProperty("className")
  private String className;

-  @JsonProperty("color")
  private String color = "red";

  /**
@@ -70,6 +68,7 @@ public class Animal {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
  public String getClassName() {
    return className;
  }
@@ -89,6 +88,7 @@ public class Animal {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("color")
  public String getColor() {
    return color;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {

-  @JsonProperty("ArrayArrayNumber")
  @Valid
  private List<List<BigDecimal>> arrayArrayNumber;

@@ -48,6 +47,7 @@ public class ArrayOfArrayOfNumberOnly {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
  public List<List<BigDecimal>> getArrayArrayNumber() {
    return arrayArrayNumber;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {

-  @JsonProperty("ArrayNumber")
  @Valid
  private List<BigDecimal> arrayNumber;

@@ -48,6 +47,7 @@ public class ArrayOfNumberOnly {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
  public List<BigDecimal> getArrayNumber() {
    return arrayNumber;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {

-  @JsonProperty("array_of_string")
  @Valid
  private List<String> arrayOfString;

-  @JsonProperty("array_array_of_integer")
  @Valid
  private List<List<Long>> arrayArrayOfInteger;

-  @JsonProperty("array_array_of_model")
  @Valid
  private List<List<ReadOnlyFirst>> arrayArrayOfModel;

@@ -56,6 +53,7 @@ public class ArrayTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
  public List<String> getArrayOfString() {
    return arrayOfString;
  }
@@ -83,6 +81,7 @@ public class ArrayTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
  public List<List<Long>> getArrayArrayOfInteger() {
    return arrayArrayOfInteger;
  }
@@ -110,6 +109,7 @@ public class ArrayTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
    return arrayArrayOfModel;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {

-  @JsonProperty("smallCamel")
  private String smallCamel;

-  @JsonProperty("CapitalCamel")
  private String capitalCamel;

-  @JsonProperty("small_Snake")
  private String smallSnake;

-  @JsonProperty("Capital_Snake")
  private String capitalSnake;

-  @JsonProperty("SCA_ETH_Flow_Points")
  private String scAETHFlowPoints;

-  @JsonProperty("ATT_NAME")
  private String ATT_NAME;

  public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
  public String getSmallCamel() {
    return smallCamel;
  }
@@ -70,6 +65,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
  public String getCapitalCamel() {
    return capitalCamel;
  }
@@ -89,6 +85,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
  public String getSmallSnake() {
    return smallSnake;
  }
@@ -108,6 +105,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
  public String getCapitalSnake() {
    return capitalSnake;
  }
@@ -127,6 +125,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
  public String getScAETHFlowPoints() {
    return scAETHFlowPoints;
  }
@@ -146,6 +145,7 @@ public class Capitalization {
  */
  
  @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
  public String getATTNAME() {
    return ATT_NAME;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
@@ -27,7 +27,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {

-  @JsonProperty("declawed")
  private Boolean declawed;

  /**
@@ -57,6 +56,7 @@ public class Cat extends Animal {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
  public Boolean getDeclawed() {
    return declawed;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {

-  @JsonProperty("declawed")
  private Boolean declawed;

  public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public class CatAllOf {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
  public Boolean getDeclawed() {
    return declawed;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {

-  @JsonProperty("id")
  private Long id;

-  @JsonProperty("name")
  private String name = "default-name";

  /**
@@ -55,6 +53,7 @@ public class Category {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("id")
  public Long getId() {
    return id;
  }
@@ -74,6 +73,7 @@ public class Category {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {

-  @JsonProperty("_class")
  private String propertyClass;

  public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public class ClassModel {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("_class")
  public String getPropertyClass() {
    return propertyClass;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {

-  @JsonProperty("client")
  private String client;

  public Client client(String client) {
@@ -36,6 +35,7 @@ public class Client {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("client")
  public String getClient() {
    return client;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {

-  @JsonProperty("breed")
  private String breed;

  /**
@@ -57,6 +56,7 @@ public class Dog extends Animal {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("breed")
  public String getBreed() {
    return breed;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {

-  @JsonProperty("breed")
  private String breed;

  public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public class DogAllOf {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("breed")
  public String getBreed() {
    return breed;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public class EnumArrays {
    }
  }

-  @JsonProperty("just_symbol")
  private JustSymbolEnum justSymbol;

  /**
@@ -98,7 +97,6 @@ public class EnumArrays {
    }
  }

-  @JsonProperty("array_enum")
  @Valid
  private List<ArrayEnumEnum> arrayEnum;

@@ -113,6 +111,7 @@ public class EnumArrays {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
  public JustSymbolEnum getJustSymbol() {
    return justSymbol;
  }
@@ -140,6 +139,7 @@ public class EnumArrays {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
  public List<ArrayEnumEnum> getArrayEnum() {
    return arrayEnum;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public class EnumTest {
    }
  }

-  @JsonProperty("enum_string")
  private EnumStringEnum enumString;

  /**
@@ -103,7 +102,6 @@ public class EnumTest {
    }
  }

-  @JsonProperty("enum_string_required")
  private EnumStringRequiredEnum enumStringRequired;

  /**
@@ -141,7 +139,6 @@ public class EnumTest {
    }
  }

-  @JsonProperty("enum_integer")
  private EnumIntegerEnum enumInteger;

  /**
@@ -179,10 +176,8 @@ public class EnumTest {
    }
  }

-  @JsonProperty("enum_number")
  private EnumNumberEnum enumNumber;

-  @JsonProperty("outerEnum")
  private OuterEnum outerEnum;

  /**
@@ -212,6 +207,7 @@ public class EnumTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
  public EnumStringEnum getEnumString() {
    return enumString;
  }
@@ -231,6 +227,7 @@ public class EnumTest {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
  public EnumStringRequiredEnum getEnumStringRequired() {
    return enumStringRequired;
  }
@@ -250,6 +247,7 @@ public class EnumTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
  public EnumIntegerEnum getEnumInteger() {
    return enumInteger;
  }
@@ -269,6 +267,7 @@ public class EnumTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
  public EnumNumberEnum getEnumNumber() {
    return enumNumber;
  }
@@ -288,6 +287,7 @@ public class EnumTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
  public OuterEnum getOuterEnum() {
    return outerEnum;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {

-  @JsonProperty("sourceURI")
  private String sourceURI;

  public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public class File {
  */
  
  @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
  public String getSourceURI() {
    return sourceURI;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {

-  @JsonProperty("file")
  private File file;

-  @JsonProperty("files")
  @Valid
  private List<@Valid File> files;

@@ -43,6 +41,7 @@ public class FileSchemaTestClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("file")
  public File getFile() {
    return file;
  }
@@ -70,6 +69,7 @@ public class FileSchemaTestClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("files")
  public List<@Valid File> getFiles() {
    return files;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {

-  @JsonProperty("integer")
  private Integer integer;

-  @JsonProperty("int32")
  private Integer int32;

-  @JsonProperty("int64")
  private Long int64;

-  @JsonProperty("number")
  private BigDecimal number;

-  @JsonProperty("float")
  private Float _float;

-  @JsonProperty("double")
  private Double _double;

-  @JsonProperty("string")
  private String string;

-  @JsonProperty("byte")
  private byte[] _byte;

-  @JsonProperty("binary")
  private org.springframework.core.io.Resource binary;

-  @JsonProperty("date")
  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
  private LocalDate date;

-  @JsonProperty("dateTime")
  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
  private OffsetDateTime dateTime;

-  @JsonProperty("uuid")
  private UUID uuid;

-  @JsonProperty("password")
  private String password;

-  @JsonProperty("BigDecimal")
  private BigDecimal bigDecimal;

  /**
@@ -106,6 +92,7 @@ public class FormatTest {
  */
  @Min(10) @Max(100) 
  @ApiModelProperty(value = "")
+  @JsonProperty("integer")
  public Integer getInteger() {
    return integer;
  }
@@ -127,6 +114,7 @@ public class FormatTest {
  */
  @Min(20) @Max(200) 
  @ApiModelProperty(value = "")
+  @JsonProperty("int32")
  public Integer getInt32() {
    return int32;
  }
@@ -146,6 +134,7 @@ public class FormatTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("int64")
  public Long getInt64() {
    return int64;
  }
@@ -167,6 +156,7 @@ public class FormatTest {
  */
  @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
  public BigDecimal getNumber() {
    return number;
  }
@@ -188,6 +178,7 @@ public class FormatTest {
  */
  @DecimalMin("54.3") @DecimalMax("987.6") 
  @ApiModelProperty(value = "")
+  @JsonProperty("float")
  public Float getFloat() {
    return _float;
  }
@@ -209,6 +200,7 @@ public class FormatTest {
  */
  @DecimalMin("67.8") @DecimalMax("123.4") 
  @ApiModelProperty(value = "")
+  @JsonProperty("double")
  public Double getDouble() {
    return _double;
  }
@@ -228,6 +220,7 @@ public class FormatTest {
  */
  @Pattern(regexp = "/[a-z]/i") 
  @ApiModelProperty(value = "")
+  @JsonProperty("string")
  public String getString() {
    return string;
  }
@@ -247,6 +240,7 @@ public class FormatTest {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
  public byte[] getByte() {
    return _byte;
  }
@@ -266,6 +260,7 @@ public class FormatTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("binary")
  public org.springframework.core.io.Resource getBinary() {
    return binary;
  }
@@ -285,6 +280,7 @@ public class FormatTest {
  */
  @NotNull @Valid 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
  public LocalDate getDate() {
    return date;
  }
@@ -304,6 +300,7 @@ public class FormatTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
  public OffsetDateTime getDateTime() {
    return dateTime;
  }
@@ -323,6 +320,7 @@ public class FormatTest {
  */
  @Valid 
  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
  public UUID getUuid() {
    return uuid;
  }
@@ -342,6 +340,7 @@ public class FormatTest {
  */
  @NotNull @Size(min = 10, max = 64) 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
  public String getPassword() {
    return password;
  }
@@ -361,6 +360,7 @@ public class FormatTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
  public BigDecimal getBigDecimal() {
    return bigDecimal;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {

-  @JsonProperty("bar")
  private String bar;

-  @JsonProperty("foo")
  private String foo;

  public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public class HasOnlyReadOnly {
  */
  
  @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
  public String getBar() {
    return bar;
  }
@@ -60,6 +59,7 @@ public class HasOnlyReadOnly {
  */
  
  @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
  public String getFoo() {
    return foo;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {

-  @JsonProperty("map_map_of_string")
  @Valid
  private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();

@@ -64,15 +63,12 @@ public class MapTest {
    }
  }

-  @JsonProperty("map_of_enum_string")
  @Valid
  private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();

-  @JsonProperty("direct_map")
  @Valid
  private Map<String, Boolean> directMap = new HashMap<>();

-  @JsonProperty("indirect_map")
  @Valid
  private Map<String, Boolean> indirectMap = new HashMap<>();

@@ -95,6 +91,7 @@ public class MapTest {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
  public Map<String, Map<String, String>> getMapMapOfString() {
    return mapMapOfString;
  }
@@ -122,6 +119,7 @@ public class MapTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
  public Map<String, InnerEnum> getMapOfEnumString() {
    return mapOfEnumString;
  }
@@ -149,6 +147,7 @@ public class MapTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
  public Map<String, Boolean> getDirectMap() {
    return directMap;
  }
@@ -176,6 +175,7 @@ public class MapTest {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
  public Map<String, Boolean> getIndirectMap() {
    return indirectMap;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {

-  @JsonProperty("uuid")
  private UUID uuid;

-  @JsonProperty("dateTime")
  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
  private OffsetDateTime dateTime;

-  @JsonProperty("map")
  @Valid
  private Map<String, Animal> map = new HashMap<>();

@@ -50,6 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
  public UUID getUuid() {
    return uuid;
  }
@@ -69,6 +67,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
  public OffsetDateTime getDateTime() {
    return dateTime;
  }
@@ -96,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("map")
  public Map<String, Animal> getMap() {
    return map;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {

-  @JsonProperty("name")
  private Integer name;

-  @JsonProperty("class")
  private String propertyClass;

  public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public class Model200Response {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public Integer getName() {
    return name;
  }
@@ -61,6 +60,7 @@ public class Model200Response {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("class")
  public String getPropertyClass() {
    return propertyClass;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {

-  @JsonProperty("code")
  private Integer code;

-  @JsonProperty("type")
  private String type;

-  @JsonProperty("message")
  private String message;

  public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public class ModelApiResponse {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("code")
  public Integer getCode() {
    return code;
  }
@@ -63,6 +61,7 @@ public class ModelApiResponse {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("type")
  public String getType() {
    return type;
  }
@@ -82,6 +81,7 @@ public class ModelApiResponse {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("message")
  public String getMessage() {
    return message;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {

-  @JsonProperty("123-list")
  private String _123list;

  public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public class ModelList {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
  public String get123list() {
    return _123list;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {

-  @JsonProperty("return")
  private Integer _return;

  public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public class ModelReturn {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("return")
  public Integer getReturn() {
    return _return;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {

-  @JsonProperty("name")
  private Integer name;

-  @JsonProperty("snake_case")
  private Integer snakeCase;

-  @JsonProperty("property")
  private String property;

-  @JsonProperty("123Number")
  private Integer _123number;

  /**
@@ -62,6 +58,7 @@ public class Name {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
  public Integer getName() {
    return name;
  }
@@ -81,6 +78,7 @@ public class Name {
  */
  
  @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
  public Integer getSnakeCase() {
    return snakeCase;
  }
@@ -100,6 +98,7 @@ public class Name {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("property")
  public String getProperty() {
    return property;
  }
@@ -119,6 +118,7 @@ public class Name {
  */
  
  @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
  public Integer get123number() {
    return _123number;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {

-  @JsonProperty("JustNumber")
  private BigDecimal justNumber;

  public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public class NumberOnly {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
  public BigDecimal getJustNumber() {
    return justNumber;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {

-  @JsonProperty("id")
  private Long id;

-  @JsonProperty("petId")
  private Long petId;

-  @JsonProperty("quantity")
  private Integer quantity;

-  @JsonProperty("shipDate")
  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
  private OffsetDateTime shipDate;

@@ -75,10 +71,8 @@ public class Order {
    }
  }

-  @JsonProperty("status")
  private StatusEnum status;

-  @JsonProperty("complete")
  private Boolean complete = false;

  public Order id(Long id) {
@@ -92,6 +86,7 @@ public class Order {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("id")
  public Long getId() {
    return id;
  }
@@ -111,6 +106,7 @@ public class Order {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("petId")
  public Long getPetId() {
    return petId;
  }
@@ -130,6 +126,7 @@ public class Order {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
  public Integer getQuantity() {
    return quantity;
  }
@@ -149,6 +146,7 @@ public class Order {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
  public OffsetDateTime getShipDate() {
    return shipDate;
  }
@@ -168,6 +166,7 @@ public class Order {
  */
  
  @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
  public StatusEnum getStatus() {
    return status;
  }
@@ -187,6 +186,7 @@ public class Order {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("complete")
  public Boolean getComplete() {
    return complete;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {

-  @JsonProperty("my_number")
  private BigDecimal myNumber;

-  @JsonProperty("my_string")
  private String myString;

-  @JsonProperty("my_boolean")
  private Boolean myBoolean;

  public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public class OuterComposite {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
  public BigDecimal getMyNumber() {
    return myNumber;
  }
@@ -62,6 +60,7 @@ public class OuterComposite {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
  public String getMyString() {
    return myString;
  }
@@ -81,6 +80,7 @@ public class OuterComposite {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
  public Boolean getMyBoolean() {
    return myBoolean;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {

-  @JsonProperty("id")
  private Long id;

-  @JsonProperty("category")
  private Category category;

-  @JsonProperty("name")
  private String name;

-  @JsonProperty("photoUrls")
  @Valid
  private List<String> photoUrls = new ArrayList<>();

-  @JsonProperty("tags")
  @Valid
  private List<@Valid Tag> tags;

@@ -81,7 +76,6 @@ public class Pet {
    }
  }

-  @JsonProperty("status")
  private StatusEnum status;

  /**
@@ -112,6 +106,7 @@ public class Pet {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("id")
  public Long getId() {
    return id;
  }
@@ -131,6 +126,7 @@ public class Pet {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("category")
  public Category getCategory() {
    return category;
  }
@@ -150,6 +146,7 @@ public class Pet {
  */
  @NotNull 
  @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
@@ -177,6 +174,7 @@ public class Pet {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
  public List<String> getPhotoUrls() {
    return photoUrls;
  }
@@ -204,6 +202,7 @@ public class Pet {
  */
  @Valid 
  @ApiModelProperty(value = "")
+  @JsonProperty("tags")
  public List<@Valid Tag> getTags() {
    return tags;
  }
@@ -223,6 +222,7 @@ public class Pet {
  */
  
  @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
  public StatusEnum getStatus() {
    return status;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {

-  @JsonProperty("bar")
  private String bar;

-  @JsonProperty("baz")
  private String baz;

  public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public class ReadOnlyFirst {
  */
  
  @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
  public String getBar() {
    return bar;
  }
@@ -58,6 +57,7 @@ public class ReadOnlyFirst {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("baz")
  public String getBaz() {
    return baz;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {

-  @JsonProperty("$special[property.name]")
  private Long $specialPropertyName;

  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
  public Long get$SpecialPropertyName() {
    return $specialPropertyName;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {

-  @JsonProperty("id")
  private Long id;

-  @JsonProperty("name")
  private String name;

  public Tag id(Long id) {
@@ -39,6 +37,7 @@ public class Tag {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("id")
  public Long getId() {
    return id;
  }
@@ -58,6 +57,7 @@ public class Tag {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name")
  public String getName() {
    return name;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {

-  @JsonProperty("string_item")
  private String stringItem = "what";

-  @JsonProperty("number_item")
  private BigDecimal numberItem;

-  @JsonProperty("integer_item")
  private Integer integerItem;

-  @JsonProperty("bool_item")
  private Boolean boolItem = true;

-  @JsonProperty("array_item")
  @Valid
  private List<Integer> arrayItem = new ArrayList<>();

@@ -72,6 +67,7 @@ public class TypeHolderDefault {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
  public String getStringItem() {
    return stringItem;
  }
@@ -91,6 +87,7 @@ public class TypeHolderDefault {
  */
  @NotNull @Valid 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
  public BigDecimal getNumberItem() {
    return numberItem;
  }
@@ -110,6 +107,7 @@ public class TypeHolderDefault {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
  public Integer getIntegerItem() {
    return integerItem;
  }
@@ -129,6 +127,7 @@ public class TypeHolderDefault {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
  public Boolean getBoolItem() {
    return boolItem;
  }
@@ -156,6 +155,7 @@ public class TypeHolderDefault {
  */
  @NotNull 
  @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
  public List<Integer> getArrayItem() {
    return arrayItem;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {

-  @JsonProperty("string_item")
  private String stringItem;

-  @JsonProperty("number_item")
  private BigDecimal numberItem;

-  @JsonProperty("float_item")
  private Float floatItem;

-  @JsonProperty("integer_item")
  private Integer integerItem;

-  @JsonProperty("bool_item")
  private Boolean boolItem;

-  @JsonProperty("array_item")
  @Valid
  private List<Integer> arrayItem = new ArrayList<>();

@@ -76,6 +70,7 @@ public class TypeHolderExample {
  */
  @NotNull 
  @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
  public String getStringItem() {
    return stringItem;
  }
@@ -95,6 +90,7 @@ public class TypeHolderExample {
  */
  @NotNull @Valid 
  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
  public BigDecimal getNumberItem() {
    return numberItem;
  }
@@ -114,6 +110,7 @@ public class TypeHolderExample {
  */
  @NotNull 
  @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
  public Float getFloatItem() {
    return floatItem;
  }
@@ -133,6 +130,7 @@ public class TypeHolderExample {
  */
  @NotNull 
  @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
  public Integer getIntegerItem() {
    return integerItem;
  }
@@ -152,6 +150,7 @@ public class TypeHolderExample {
  */
  @NotNull 
  @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
  public Boolean getBoolItem() {
    return boolItem;
  }
@@ -179,6 +178,7 @@ public class TypeHolderExample {
  */
  @NotNull 
  @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
  public List<Integer> getArrayItem() {
    return arrayItem;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {

-  @JsonProperty("id")
  private Long id;

-  @JsonProperty("username")
  private String username;

-  @JsonProperty("firstName")
  private String firstName;

-  @JsonProperty("lastName")
  private String lastName;

-  @JsonProperty("email")
  private String email;

-  @JsonProperty("password")
  private String password;

-  @JsonProperty("phone")
  private String phone;

-  @JsonProperty("userStatus")
  private Integer userStatus;

  public User id(Long id) {
@@ -57,6 +49,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("id")
  public Long getId() {
    return id;
  }
@@ -76,6 +69,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("username")
  public String getUsername() {
    return username;
  }
@@ -95,6 +89,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
  public String getFirstName() {
    return firstName;
  }
@@ -114,6 +109,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
  public String getLastName() {
    return lastName;
  }
@@ -133,6 +129,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("email")
  public String getEmail() {
    return email;
  }
@@ -152,6 +149,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("password")
  public String getPassword() {
    return password;
  }
@@ -171,6 +169,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("phone")
  public String getPhone() {
    return phone;
  }
@@ -190,6 +189,7 @@ public class User {
  */
  
  @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
  public Integer getUserStatus() {
    return userStatus;
  }
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@ import javax.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {

-  @JsonProperty("attribute_string")
  private String attributeString;

-  @JsonProperty("attribute_number")
  private BigDecimal attributeNumber;

-  @JsonProperty("attribute_integer")
  private Integer attributeInteger;

-  @JsonProperty("attribute_boolean")
  private Boolean attributeBoolean;

-  @JsonProperty("wrapped_array")
  @Valid
  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")
  @Valid
  private List<Integer> nameArray;

-  @JsonProperty("name_wrapped_array")
  @Valid
  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")
  @Valid
  private List<Integer> prefixArray;

-  @JsonProperty("prefix_wrapped_array")
  @Valid
  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")
  @Valid
  private List<Integer> namespaceArray;

-  @JsonProperty("namespace_wrapped_array")
  @Valid
  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")
  @Valid
  private List<Integer> prefixNsArray;

-  @JsonProperty("prefix_ns_wrapped_array")
  @Valid
  private List<Integer> prefixNsWrappedArray;

@@ -132,6 +103,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
  public String getAttributeString() {
    return attributeString;
  }
@@ -151,6 +123,7 @@ public class XmlItem {
  */
  @Valid 
  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
  public BigDecimal getAttributeNumber() {
    return attributeNumber;
  }
@@ -170,6 +143,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
  public Integer getAttributeInteger() {
    return attributeInteger;
  }
@@ -189,6 +163,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
  public Boolean getAttributeBoolean() {
    return attributeBoolean;
  }
@@ -216,6 +191,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
  public List<Integer> getWrappedArray() {
    return wrappedArray;
  }
@@ -235,6 +211,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
  public String getNameString() {
    return nameString;
  }
@@ -254,6 +231,7 @@ public class XmlItem {
  */
  @Valid 
  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
  public BigDecimal getNameNumber() {
    return nameNumber;
  }
@@ -273,6 +251,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
  public Integer getNameInteger() {
    return nameInteger;
  }
@@ -292,6 +271,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
  public Boolean getNameBoolean() {
    return nameBoolean;
  }
@@ -319,6 +299,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
  public List<Integer> getNameArray() {
    return nameArray;
  }
@@ -346,6 +327,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
  public List<Integer> getNameWrappedArray() {
    return nameWrappedArray;
  }
@@ -365,6 +347,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
  public String getPrefixString() {
    return prefixString;
  }
@@ -384,6 +367,7 @@ public class XmlItem {
  */
  @Valid 
  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
  public BigDecimal getPrefixNumber() {
    return prefixNumber;
  }
@@ -403,6 +387,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
  public Integer getPrefixInteger() {
    return prefixInteger;
  }
@@ -422,6 +407,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
  public Boolean getPrefixBoolean() {
    return prefixBoolean;
  }
@@ -449,6 +435,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
  public List<Integer> getPrefixArray() {
    return prefixArray;
  }
@@ -476,6 +463,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
  public List<Integer> getPrefixWrappedArray() {
    return prefixWrappedArray;
  }
@@ -495,6 +483,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
  public String getNamespaceString() {
    return namespaceString;
  }
@@ -514,6 +503,7 @@ public class XmlItem {
  */
  @Valid 
  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
  public BigDecimal getNamespaceNumber() {
    return namespaceNumber;
  }
@@ -533,6 +523,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
  public Integer getNamespaceInteger() {
    return namespaceInteger;
  }
@@ -552,6 +543,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
  public Boolean getNamespaceBoolean() {
    return namespaceBoolean;
  }
@@ -579,6 +571,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
  public List<Integer> getNamespaceArray() {
    return namespaceArray;
  }
@@ -606,6 +599,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
  public List<Integer> getNamespaceWrappedArray() {
    return namespaceWrappedArray;
  }
@@ -625,6 +619,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
  public String getPrefixNsString() {
    return prefixNsString;
  }
@@ -644,6 +639,7 @@ public class XmlItem {
  */
  @Valid 
  @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
  public BigDecimal getPrefixNsNumber() {
    return prefixNsNumber;
  }
@@ -663,6 +659,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
  public Integer getPrefixNsInteger() {
    return prefixNsInteger;
  }
@@ -682,6 +679,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
  public Boolean getPrefixNsBoolean() {
    return prefixNsBoolean;
  }
@@ -709,6 +707,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
  public List<Integer> getPrefixNsArray() {
    return prefixNsArray;
  }
@@ -736,6 +735,7 @@ public class XmlItem {
  */
  
  @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
  public List<Integer> getPrefixNsWrappedArray() {
    return prefixNsWrappedArray;
  }