[Java][client] make it possible to send explicit nulls for nullable fields (#3474)

* [Java][client] make it possible to send explicit nulls for nullable fields

* Regenerate samples

samples/client/petstore/java/resttemplate-withXml/docs/UserApi.md

@@ -101,7 +101,7 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(null); // List<User> | List of user object
+        List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
             apiInstance.createUsersWithArrayInput(body);
         } catch (ApiException e) {
@@ -163,7 +163,7 @@ public class Example {
         defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
         UserApi apiInstance = new UserApi(defaultClient);
-        List<User> body = Arrays.asList(null); // List<User> | List of user object
+        List<User> body = Arrays.asList(); // List<User> | List of user object
         try {
             apiInstance.createUsersWithListInput(body);
         } catch (ApiException e) {

samples/client/petstore/java/resttemplate-withXml/pom.xml

@@ -236,6 +236,11 @@
             <artifactId>jackson-jaxrs-json-provider</artifactId>
             <version>${jackson-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable-version}</version>
+        </dependency>
 
             <!-- XML processing: Jackson -->
             <dependency>
@@ -264,6 +269,7 @@
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
         <jackson-version>2.9.9</jackson-version>
         <jackson-databind-version>2.9.9</jackson-databind-version>
+        <jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
         <jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.12</junit-version>

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java

@@ -34,6 +34,7 @@ import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.openapitools.jackson.nullable.JsonNullableModule;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -649,6 +650,7 @@ public class ApiClient {
         messageConverters.add(new MappingJackson2HttpMessageConverter());
         XmlMapper xmlMapper = new XmlMapper();
         xmlMapper.configure(ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true);
+        xmlMapper.registerModule(new JsonNullableModule());
         messageConverters.add(new MappingJackson2XmlHttpMessageConverter(xmlMapper));
 
         RestTemplate restTemplate = new RestTemplate(messageConverters);
@@ -661,6 +663,7 @@ public class ApiClient {
                 module.addDeserializer(OffsetDateTime.class, CustomInstantDeserializer.OFFSET_DATE_TIME);
                 module.addDeserializer(ZonedDateTime.class, CustomInstantDeserializer.ZONED_DATE_TIME);
                 mapper.registerModule(module);
+                mapper.registerModule(new JsonNullableModule());
             }
         }
         // This allows us to read the response more than once - Necessary for debugging.

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesAnyType")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesAnyType name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -50,10 +51,16 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,13 +35,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesArray")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesArray name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -51,10 +52,16 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesBoolean")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesBoolean name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -50,10 +51,16 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -35,89 +36,77 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
 public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
-  @JsonProperty(JSON_PROPERTY_MAP_STRING)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=String
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_STRING = "map_string";
   private Map<String, String> mapString = null;
 
-  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
-  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=BigDecimal
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
   private Map<String, BigDecimal> mapNumber = null;
 
-  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
-  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
   private Map<String, Integer> mapInteger = null;
 
-  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
-  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Boolean
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
   private Map<String, Boolean> mapBoolean = null;
 
-  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=List&lt;Integer&gt;
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
   private Map<String, List<Integer>> mapArrayInteger = null;
 
-  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
-  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=List&lt;Object&gt;
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
   private Map<String, List<Object>> mapArrayAnytype = null;
 
-  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Map&lt;String, String&gt;
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
   private Map<String, Map<String, String>> mapMapString = null;
 
-  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Map&lt;String, Object&gt;
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
   private Map<String, Map<String, Object>> mapMapAnytype = null;
 
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JacksonXmlProperty(localName = "anytype_1")
   @XmlElement(name = "anytype_1")
-  private Object anytype1 = null;
+  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
+  private Object anytype1;
 
-  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
-  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
-  @JacksonXmlProperty(localName = "anytype_2")
   @XmlElement(name = "anytype_2")
-  private Object anytype2 = null;
+  public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
+  private Object anytype2;
 
-  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
-  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
-  @JacksonXmlProperty(localName = "anytype_3")
   @XmlElement(name = "anytype_3")
-  private Object anytype3 = null;
+  public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
+  private Object anytype3;
+
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    
     this.mapString = mapString;
     return this;
   }
@@ -136,15 +125,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, String> getMapString() {
     return mapString;
   }
 
+
+
   public void setMapString(Map<String, String> mapString) {
     this.mapString = mapString;
   }
 
+
   public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    
     this.mapNumber = mapNumber;
     return this;
   }
@@ -163,15 +159,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
 
+
+
   public void setMapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
   }
 
+
   public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    
     this.mapInteger = mapInteger;
     return this;
   }
@@ -190,15 +193,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
 
+
+
   public void setMapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
   }
 
+
   public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    
     this.mapBoolean = mapBoolean;
     return this;
   }
@@ -217,15 +227,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
 
+
+
   public void setMapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
   }
 
+
   public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    
     this.mapArrayInteger = mapArrayInteger;
     return this;
   }
@@ -244,15 +261,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
 
+
+
   public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
   }
 
+
   public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    
     this.mapArrayAnytype = mapArrayAnytype;
     return this;
   }
@@ -271,15 +295,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
 
+
+
   public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
   }
 
+
   public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    
     this.mapMapString = mapMapString;
     return this;
   }
@@ -298,15 +329,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
 
+
+
   public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
   }
 
+
   public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    
     this.mapMapAnytype = mapMapAnytype;
     return this;
   }
@@ -325,15 +363,22 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
 
+
+
   public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
   }
 
+
   public AdditionalPropertiesClass anytype1(Object anytype1) {
+    
     this.anytype1 = anytype1;
     return this;
   }
@@ -344,15 +389,23 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "anytype_1")
+
   public Object getAnytype1() {
     return anytype1;
   }
 
+
+
   public void setAnytype1(Object anytype1) {
     this.anytype1 = anytype1;
   }
 
+
   public AdditionalPropertiesClass anytype2(Object anytype2) {
+    
     this.anytype2 = anytype2;
     return this;
   }
@@ -363,15 +416,23 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "anytype_2")
+
   public Object getAnytype2() {
     return anytype2;
   }
 
+
+
   public void setAnytype2(Object anytype2) {
     this.anytype2 = anytype2;
   }
 
+
   public AdditionalPropertiesClass anytype3(Object anytype3) {
+    
     this.anytype3 = anytype3;
     return this;
   }
@@ -382,10 +443,16 @@ public class AdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "anytype_3")
+
   public Object getAnytype3() {
     return anytype3;
   }
 
+
+
   public void setAnytype3(Object anytype3) {
     this.anytype3 = anytype3;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesInteger")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesInteger name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -50,10 +51,16 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,13 +35,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesNumber")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesNumber name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -51,10 +52,16 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesObject")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesObject name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -50,10 +51,16 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesString")
 public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public AdditionalPropertiesString name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -50,10 +51,16 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -39,19 +40,17 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Animal")
 public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JacksonXmlProperty(localName = "className")
   @XmlElement(name = "className")
+  public static final String JSON_PROPERTY_CLASS_NAME = "className";
   private String className;
 
-  public static final String JSON_PROPERTY_COLOR = "color";
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JacksonXmlProperty(localName = "color")
   @XmlElement(name = "color")
+  public static final String JSON_PROPERTY_COLOR = "color";
   private String color = "red";
 
+
   public Animal className(String className) {
+    
     this.className = className;
     return this;
   }
@@ -61,15 +60,23 @@ public class Animal {
    * @return className
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "className")
+
   public String getClassName() {
     return className;
   }
 
+
+
   public void setClassName(String className) {
     this.className = className;
   }
 
+
   public Animal color(String color) {
+    
     this.color = color;
     return this;
   }
@@ -80,10 +87,16 @@ public class Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COLOR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "color")
+
   public String getColor() {
     return color;
   }
 
+
+
   public void setColor(String color) {
     this.color = color;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,15 +35,16 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
 public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   // Is a container wrapped=false
   // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
   // items.example= items.type=List<BigDecimal>
   @XmlElement(name = "arrayArrayNumber")
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
+
   public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    
     this.arrayArrayNumber = arrayArrayNumber;
     return this;
   }
@@ -61,10 +63,15 @@ public class ArrayOfArrayOfNumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
 
+
+
   public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,15 +35,16 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
 public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   // Is a container wrapped=false
   // items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace=
   // items.example= items.type=BigDecimal
   @XmlElement(name = "arrayNumber")
+  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   private List<BigDecimal> arrayNumber = null;
 
+
   public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
+    
     this.arrayNumber = arrayNumber;
     return this;
   }
@@ -61,10 +63,15 @@ public class ArrayOfNumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
 
+
+
   public void setArrayNumber(List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,31 +35,30 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayTest")
 public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   // Is a container wrapped=false
   // items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace=
   // items.example= items.type=String
   @XmlElement(name = "arrayOfString")
+  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
   private List<String> arrayOfString = null;
 
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   // Is a container wrapped=false
   // items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace=
   // items.example= items.type=List&lt;Long&gt;
   @XmlElement(name = "arrayArrayOfInteger")
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
   private List<List<Long>> arrayArrayOfInteger = null;
 
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   // Is a container wrapped=false
   // items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace=
   // items.example= items.type=List&lt;ReadOnlyFirst&gt;
   @XmlElement(name = "arrayArrayOfModel")
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
+
   public ArrayTest arrayOfString(List<String> arrayOfString) {
+    
     this.arrayOfString = arrayOfString;
     return this;
   }
@@ -77,15 +77,22 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
 
+
+
   public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
   }
 
+
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    
     this.arrayArrayOfInteger = arrayArrayOfInteger;
     return this;
   }
@@ -104,15 +111,22 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
 
+
+
   public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
   }
 
+
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    
     this.arrayArrayOfModel = arrayArrayOfModel;
     return this;
   }
@@ -131,10 +145,15 @@ public class ArrayTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
 
+
+
   public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,43 +32,33 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Capitalization")
 public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JacksonXmlProperty(localName = "smallCamel")
   @XmlElement(name = "smallCamel")
+  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
   private String smallCamel;
 
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JacksonXmlProperty(localName = "CapitalCamel")
   @XmlElement(name = "CapitalCamel")
+  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
   private String capitalCamel;
 
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JacksonXmlProperty(localName = "small_Snake")
   @XmlElement(name = "small_Snake")
+  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
   private String smallSnake;
 
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JacksonXmlProperty(localName = "Capital_Snake")
   @XmlElement(name = "Capital_Snake")
+  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
   private String capitalSnake;
 
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JacksonXmlProperty(localName = "SCA_ETH_Flow_Points")
   @XmlElement(name = "SCA_ETH_Flow_Points")
+  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
   private String scAETHFlowPoints;
 
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JacksonXmlProperty(localName = "ATT_NAME")
   @XmlElement(name = "ATT_NAME")
+  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
   private String ATT_NAME;
 
+
   public Capitalization smallCamel(String smallCamel) {
+    
     this.smallCamel = smallCamel;
     return this;
   }
@@ -78,15 +69,23 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "smallCamel")
+
   public String getSmallCamel() {
     return smallCamel;
   }
 
+
+
   public void setSmallCamel(String smallCamel) {
     this.smallCamel = smallCamel;
   }
 
+
   public Capitalization capitalCamel(String capitalCamel) {
+    
     this.capitalCamel = capitalCamel;
     return this;
   }
@@ -97,15 +96,23 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "CapitalCamel")
+
   public String getCapitalCamel() {
     return capitalCamel;
   }
 
+
+
   public void setCapitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
   }
 
+
   public Capitalization smallSnake(String smallSnake) {
+    
     this.smallSnake = smallSnake;
     return this;
   }
@@ -116,15 +123,23 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "small_Snake")
+
   public String getSmallSnake() {
     return smallSnake;
   }
 
+
+
   public void setSmallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
   }
 
+
   public Capitalization capitalSnake(String capitalSnake) {
+    
     this.capitalSnake = capitalSnake;
     return this;
   }
@@ -135,15 +150,23 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "Capital_Snake")
+
   public String getCapitalSnake() {
     return capitalSnake;
   }
 
+
+
   public void setCapitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
   }
 
+
   public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    
     this.scAETHFlowPoints = scAETHFlowPoints;
     return this;
   }
@@ -154,15 +177,23 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "SCA_ETH_Flow_Points")
+
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
 
+
+
   public void setScAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
   }
 
+
   public Capitalization ATT_NAME(String ATT_NAME) {
+    
     this.ATT_NAME = ATT_NAME;
     return this;
   }
@@ -173,10 +204,16 @@ public class Capitalization {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "ATT_NAME")
+
   public String getATTNAME() {
     return ATT_NAME;
   }
 
+
+
   public void setATTNAME(String ATT_NAME) {
     this.ATT_NAME = ATT_NAME;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Cat")
 public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JacksonXmlProperty(localName = "declawed")
   @XmlElement(name = "declawed")
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
+
   public Cat declawed(Boolean declawed) {
+    
     this.declawed = declawed;
     return this;
   }
@@ -50,10 +51,16 @@ public class Cat extends Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "declawed")
+
   public Boolean getDeclawed() {
     return declawed;
   }
 
+
+
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,13 +32,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "CatAllOf")
 public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JacksonXmlProperty(localName = "declawed")
   @XmlElement(name = "declawed")
+  public static final String JSON_PROPERTY_DECLAWED = "declawed";
   private Boolean declawed;
 
+
   public CatAllOf declawed(Boolean declawed) {
+    
     this.declawed = declawed;
     return this;
   }
@@ -48,10 +49,16 @@ public class CatAllOf {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DECLAWED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "declawed")
+
   public Boolean getDeclawed() {
     return declawed;
   }
 
+
+
   public void setDeclawed(Boolean declawed) {
     this.declawed = declawed;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,19 +32,17 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Category")
 public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JacksonXmlProperty(localName = "id")
   @XmlElement(name = "id")
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name = "default-name";
 
+
   public Category id(Long id) {
+    
     this.id = id;
     return this;
   }
@@ -54,15 +53,23 @@ public class Category {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "id")
+
   public Long getId() {
     return id;
   }
 
+
+
   public void setId(Long id) {
     this.id = id;
   }
 
+
   public Category name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -72,10 +79,16 @@ public class Category {
    * @return name
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,13 +33,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ClassModel")
 public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JacksonXmlProperty(localName = "_class")
   @XmlElement(name = "_class")
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
   private String propertyClass;
 
+
   public ClassModel propertyClass(String propertyClass) {
+    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -49,10 +50,16 @@ public class ClassModel {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "_class")
+
   public String getPropertyClass() {
     return propertyClass;
   }
 
+
+
   public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,13 +32,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Client")
 public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JacksonXmlProperty(localName = "client")
   @XmlElement(name = "client")
+  public static final String JSON_PROPERTY_CLIENT = "client";
   private String client;
 
+
   public Client client(String client) {
+    
     this.client = client;
     return this;
   }
@@ -48,10 +49,16 @@ public class Client {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CLIENT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "client")
+
   public String getClient() {
     return client;
   }
 
+
+
   public void setClient(String client) {
     this.client = client;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,13 +34,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Dog")
 public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JacksonXmlProperty(localName = "breed")
   @XmlElement(name = "breed")
+  public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
+
   public Dog breed(String breed) {
+    
     this.breed = breed;
     return this;
   }
@@ -50,10 +51,16 @@ public class Dog extends Animal {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "breed")
+
   public String getBreed() {
     return breed;
   }
 
+
+
   public void setBreed(String breed) {
     this.breed = breed;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,13 +32,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "DogAllOf")
 public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JacksonXmlProperty(localName = "breed")
   @XmlElement(name = "breed")
+  public static final String JSON_PROPERTY_BREED = "breed";
   private String breed;
 
+
   public DogAllOf breed(String breed) {
+    
     this.breed = breed;
     return this;
   }
@@ -48,10 +49,16 @@ public class DogAllOf {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BREED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "breed")
+
   public String getBreed() {
     return breed;
   }
 
+
+
   public void setBreed(String breed) {
     this.breed = breed;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -68,10 +69,8 @@ public class EnumArrays {
     }
   }
 
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JacksonXmlProperty(localName = "just_symbol")
   @XmlElement(name = "just_symbol")
+  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
   private JustSymbolEnum justSymbol;
 
   /**
@@ -109,15 +108,16 @@ public class EnumArrays {
     }
   }
 
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   // Is a container wrapped=false
   // items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace=
   // items.example= items.type=String
   @XmlElement(name = "arrayEnum")
+  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
   private List<ArrayEnumEnum> arrayEnum = null;
 
+
   public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
+    
     this.justSymbol = justSymbol;
     return this;
   }
@@ -128,15 +128,23 @@ public class EnumArrays {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "just_symbol")
+
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
 
+
+
   public void setJustSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
   }
 
+
   public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    
     this.arrayEnum = arrayEnum;
     return this;
   }
@@ -155,10 +163,15 @@ public class EnumArrays {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
 
+
+
   public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -69,10 +70,8 @@ public class EnumTest {
     }
   }
 
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JacksonXmlProperty(localName = "enum_string")
   @XmlElement(name = "enum_string")
+  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
   private EnumStringEnum enumString;
 
   /**
@@ -112,10 +111,8 @@ public class EnumTest {
     }
   }
 
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JacksonXmlProperty(localName = "enum_string_required")
   @XmlElement(name = "enum_string_required")
+  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -153,10 +150,8 @@ public class EnumTest {
     }
   }
 
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JacksonXmlProperty(localName = "enum_integer")
   @XmlElement(name = "enum_integer")
+  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -194,19 +189,17 @@ public class EnumTest {
     }
   }
 
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JacksonXmlProperty(localName = "enum_number")
   @XmlElement(name = "enum_number")
+  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
   private EnumNumberEnum enumNumber;
 
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JacksonXmlProperty(localName = "outerEnum")
   @XmlElement(name = "outerEnum")
+  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
   private OuterEnum outerEnum;
 
+
   public EnumTest enumString(EnumStringEnum enumString) {
+    
     this.enumString = enumString;
     return this;
   }
@@ -217,15 +210,23 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "enum_string")
+
   public EnumStringEnum getEnumString() {
     return enumString;
   }
 
+
+
   public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
   }
 
+
   public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    
     this.enumStringRequired = enumStringRequired;
     return this;
   }
@@ -235,15 +236,23 @@ public class EnumTest {
    * @return enumStringRequired
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "enum_string_required")
+
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
 
+
+
   public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
   }
 
+
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
+    
     this.enumInteger = enumInteger;
     return this;
   }
@@ -254,15 +263,23 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "enum_integer")
+
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
 
+
+
   public void setEnumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
   }
 
+
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
+    
     this.enumNumber = enumNumber;
     return this;
   }
@@ -273,15 +290,23 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "enum_number")
+
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
 
+
+
   public void setEnumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
   }
 
+
   public EnumTest outerEnum(OuterEnum outerEnum) {
+    
     this.outerEnum = outerEnum;
     return this;
   }
@@ -292,10 +317,16 @@ public class EnumTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "outerEnum")
+
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
 
+
+
   public void setOuterEnum(OuterEnum outerEnum) {
     this.outerEnum = outerEnum;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -33,21 +34,20 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "FileSchemaTestClass")
 public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JacksonXmlProperty(localName = "file")
   @XmlElement(name = "file")
-  private java.io.File file = null;
+  public static final String JSON_PROPERTY_FILE = "file";
+  private java.io.File file;
 
-  public static final String JSON_PROPERTY_FILES = "files";
-  @JsonProperty(JSON_PROPERTY_FILES)
   // Is a container wrapped=false
   // items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
   // items.example= items.type=java.io.File
   @XmlElement(name = "files")
+  public static final String JSON_PROPERTY_FILES = "files";
   private List<java.io.File> files = null;
 
+
   public FileSchemaTestClass file(java.io.File file) {
+    
     this.file = file;
     return this;
   }
@@ -58,15 +58,23 @@ public class FileSchemaTestClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "file")
+
   public java.io.File getFile() {
     return file;
   }
 
+
+
   public void setFile(java.io.File file) {
     this.file = file;
   }
 
+
   public FileSchemaTestClass files(List<java.io.File> files) {
+    
     this.files = files;
     return this;
   }
@@ -85,10 +93,15 @@ public class FileSchemaTestClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FILES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<java.io.File> getFiles() {
     return files;
   }
 
+
+
   public void setFiles(List<java.io.File> files) {
     this.files = files;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -36,85 +37,61 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "FormatTest")
 public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JacksonXmlProperty(localName = "integer")
   @XmlElement(name = "integer")
+  public static final String JSON_PROPERTY_INTEGER = "integer";
   private Integer integer;
 
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JacksonXmlProperty(localName = "int32")
   @XmlElement(name = "int32")
+  public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
 
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JacksonXmlProperty(localName = "int64")
   @XmlElement(name = "int64")
+  public static final String JSON_PROPERTY_INT64 = "int64";
   private Long int64;
 
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JacksonXmlProperty(localName = "number")
   @XmlElement(name = "number")
+  public static final String JSON_PROPERTY_NUMBER = "number";
   private BigDecimal number;
 
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JacksonXmlProperty(localName = "float")
   @XmlElement(name = "float")
+  public static final String JSON_PROPERTY_FLOAT = "float";
   private Float _float;
 
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JacksonXmlProperty(localName = "double")
   @XmlElement(name = "double")
+  public static final String JSON_PROPERTY_DOUBLE = "double";
   private Double _double;
 
-  public static final String JSON_PROPERTY_STRING = "string";
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JacksonXmlProperty(localName = "string")
   @XmlElement(name = "string")
+  public static final String JSON_PROPERTY_STRING = "string";
   private String string;
 
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JacksonXmlProperty(localName = "byte")
   @XmlElement(name = "byte")
+  public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
 
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JacksonXmlProperty(localName = "binary")
   @XmlElement(name = "binary")
+  public static final String JSON_PROPERTY_BINARY = "binary";
   private File binary;
 
-  public static final String JSON_PROPERTY_DATE = "date";
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JacksonXmlProperty(localName = "date")
   @XmlElement(name = "date")
+  public static final String JSON_PROPERTY_DATE = "date";
   private LocalDate date;
 
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JacksonXmlProperty(localName = "dateTime")
   @XmlElement(name = "dateTime")
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   private OffsetDateTime dateTime;
 
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JacksonXmlProperty(localName = "uuid")
   @XmlElement(name = "uuid")
+  public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
 
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JacksonXmlProperty(localName = "password")
   @XmlElement(name = "password")
+  public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
+
   public FormatTest integer(Integer integer) {
+    
     this.integer = integer;
     return this;
   }
@@ -127,15 +104,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "integer")
+
   public Integer getInteger() {
     return integer;
   }
 
+
+
   public void setInteger(Integer integer) {
     this.integer = integer;
   }
 
+
   public FormatTest int32(Integer int32) {
+    
     this.int32 = int32;
     return this;
   }
@@ -148,15 +133,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT32)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "int32")
+
   public Integer getInt32() {
     return int32;
   }
 
+
+
   public void setInt32(Integer int32) {
     this.int32 = int32;
   }
 
+
   public FormatTest int64(Long int64) {
+    
     this.int64 = int64;
     return this;
   }
@@ -167,15 +160,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INT64)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "int64")
+
   public Long getInt64() {
     return int64;
   }
 
+
+
   public void setInt64(Long int64) {
     this.int64 = int64;
   }
 
+
   public FormatTest number(BigDecimal number) {
+    
     this.number = number;
     return this;
   }
@@ -187,15 +188,23 @@ public class FormatTest {
    * @return number
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "number")
+
   public BigDecimal getNumber() {
     return number;
   }
 
+
+
   public void setNumber(BigDecimal number) {
     this.number = number;
   }
 
+
   public FormatTest _float(Float _float) {
+    
     this._float = _float;
     return this;
   }
@@ -208,15 +217,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FLOAT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "float")
+
   public Float getFloat() {
     return _float;
   }
 
+
+
   public void setFloat(Float _float) {
     this._float = _float;
   }
 
+
   public FormatTest _double(Double _double) {
+    
     this._double = _double;
     return this;
   }
@@ -229,15 +246,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DOUBLE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "double")
+
   public Double getDouble() {
     return _double;
   }
 
+
+
   public void setDouble(Double _double) {
     this._double = _double;
   }
 
+
   public FormatTest string(String string) {
+    
     this.string = string;
     return this;
   }
@@ -248,15 +273,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "string")
+
   public String getString() {
     return string;
   }
 
+
+
   public void setString(String string) {
     this.string = string;
   }
 
+
   public FormatTest _byte(byte[] _byte) {
+    
     this._byte = _byte;
     return this;
   }
@@ -266,15 +299,23 @@ public class FormatTest {
    * @return _byte
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BYTE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "byte")
+
   public byte[] getByte() {
     return _byte;
   }
 
+
+
   public void setByte(byte[] _byte) {
     this._byte = _byte;
   }
 
+
   public FormatTest binary(File binary) {
+    
     this.binary = binary;
     return this;
   }
@@ -285,15 +326,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BINARY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "binary")
+
   public File getBinary() {
     return binary;
   }
 
+
+
   public void setBinary(File binary) {
     this.binary = binary;
   }
 
+
   public FormatTest date(LocalDate date) {
+    
     this.date = date;
     return this;
   }
@@ -303,15 +352,23 @@ public class FormatTest {
    * @return date
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_DATE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "date")
+
   public LocalDate getDate() {
     return date;
   }
 
+
+
   public void setDate(LocalDate date) {
     this.date = date;
   }
 
+
   public FormatTest dateTime(OffsetDateTime dateTime) {
+    
     this.dateTime = dateTime;
     return this;
   }
@@ -322,15 +379,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "dateTime")
+
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
 
+
+
   public void setDateTime(OffsetDateTime dateTime) {
     this.dateTime = dateTime;
   }
 
+
   public FormatTest uuid(UUID uuid) {
+    
     this.uuid = uuid;
     return this;
   }
@@ -341,15 +406,23 @@ public class FormatTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "uuid")
+
   public UUID getUuid() {
     return uuid;
   }
 
+
+
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
+
   public FormatTest password(String password) {
+    
     this.password = password;
     return this;
   }
@@ -359,10 +432,16 @@ public class FormatTest {
    * @return password
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "password")
+
   public String getPassword() {
     return password;
   }
 
+
+
   public void setPassword(String password) {
     this.password = password;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,39 +32,49 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "HasOnlyReadOnly")
 public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JacksonXmlProperty(localName = "bar")
   @XmlElement(name = "bar")
+  public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
 
-  public static final String JSON_PROPERTY_FOO = "foo";
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JacksonXmlProperty(localName = "foo")
   @XmlElement(name = "foo")
+  public static final String JSON_PROPERTY_FOO = "foo";
   private String foo;
 
+
    /**
    * Get bar
    * @return bar
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "bar")
+
   public String getBar() {
     return bar;
   }
 
+
+
+
    /**
    * Get foo
    * @return foo
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FOO)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "foo")
+
   public String getFoo() {
     return foo;
   }
 
 
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,12 +35,11 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "MapTest")
 public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Map<String, String>
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
   private Map<String, Map<String, String>> mapMapOfString = null;
 
   /**
@@ -77,31 +77,30 @@ public class MapTest {
     }
   }
 
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=String
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
   private Map<String, InnerEnum> mapOfEnumString = null;
 
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Boolean
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
   private Map<String, Boolean> directMap = null;
 
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Boolean
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
   private Map<String, Boolean> indirectMap = null;
 
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    
     this.mapMapOfString = mapMapOfString;
     return this;
   }
@@ -120,15 +119,22 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
 
+
+
   public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
   }
 
+
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    
     this.mapOfEnumString = mapOfEnumString;
     return this;
   }
@@ -147,15 +153,22 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
 
+
+
   public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+
   public MapTest directMap(Map<String, Boolean> directMap) {
+    
     this.directMap = directMap;
     return this;
   }
@@ -174,15 +187,22 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
 
+
+
   public void setDirectMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
   }
 
+
   public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+    
     this.indirectMap = indirectMap;
     return this;
   }
@@ -201,10 +221,15 @@ public class MapTest {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
 
+
+
   public void setIndirectMap(Map<String, Boolean> indirectMap) {
     this.indirectMap = indirectMap;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -37,27 +38,24 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "MixedPropertiesAndAdditionalPropertiesClass")
 public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JacksonXmlProperty(localName = "uuid")
   @XmlElement(name = "uuid")
+  public static final String JSON_PROPERTY_UUID = "uuid";
   private UUID uuid;
 
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JacksonXmlProperty(localName = "dateTime")
   @XmlElement(name = "dateTime")
+  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   private OffsetDateTime dateTime;
 
-  public static final String JSON_PROPERTY_MAP = "map";
-  @JsonProperty(JSON_PROPERTY_MAP)
   // Is a container wrapped=false
   // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
   // items.example= items.type=Animal
   @XmlElement(name = "inner")
+  public static final String JSON_PROPERTY_MAP = "map";
   private Map<String, Animal> map = null;
 
+
   public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+    
     this.uuid = uuid;
     return this;
   }
@@ -68,15 +66,23 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_UUID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "uuid")
+
   public UUID getUuid() {
     return uuid;
   }
 
+
+
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
   }
 
+
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+    
     this.dateTime = dateTime;
     return this;
   }
@@ -87,15 +93,23 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_DATE_TIME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "dateTime")
+
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
 
+
+
   public void setDateTime(OffsetDateTime dateTime) {
     this.dateTime = dateTime;
   }
 
+
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    
     this.map = map;
     return this;
   }
@@ -114,10 +128,15 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MAP)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public Map<String, Animal> getMap() {
     return map;
   }
 
+
+
   public void setMap(Map<String, Animal> map) {
     this.map = map;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,19 +33,17 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Name")
 public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
 
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JacksonXmlProperty(localName = "class")
   @XmlElement(name = "class")
+  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
   private String propertyClass;
 
+
   public Model200Response name(Integer name) {
+    
     this.name = name;
     return this;
   }
@@ -55,15 +54,23 @@ public class Model200Response {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public Integer getName() {
     return name;
   }
 
+
+
   public void setName(Integer name) {
     this.name = name;
   }
 
+
   public Model200Response propertyClass(String propertyClass) {
+    
     this.propertyClass = propertyClass;
     return this;
   }
@@ -74,10 +81,16 @@ public class Model200Response {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "class")
+
   public String getPropertyClass() {
     return propertyClass;
   }
 
+
+
   public void setPropertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,25 +32,21 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ModelApiResponse")
 public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JacksonXmlProperty(localName = "code")
   @XmlElement(name = "code")
+  public static final String JSON_PROPERTY_CODE = "code";
   private Integer code;
 
-  public static final String JSON_PROPERTY_TYPE = "type";
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JacksonXmlProperty(localName = "type")
   @XmlElement(name = "type")
+  public static final String JSON_PROPERTY_TYPE = "type";
   private String type;
 
-  public static final String JSON_PROPERTY_MESSAGE = "message";
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JacksonXmlProperty(localName = "message")
   @XmlElement(name = "message")
+  public static final String JSON_PROPERTY_MESSAGE = "message";
   private String message;
 
+
   public ModelApiResponse code(Integer code) {
+    
     this.code = code;
     return this;
   }
@@ -60,15 +57,23 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CODE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "code")
+
   public Integer getCode() {
     return code;
   }
 
+
+
   public void setCode(Integer code) {
     this.code = code;
   }
 
+
   public ModelApiResponse type(String type) {
+    
     this.type = type;
     return this;
   }
@@ -79,15 +84,23 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "type")
+
   public String getType() {
     return type;
   }
 
+
+
   public void setType(String type) {
     this.type = type;
   }
 
+
   public ModelApiResponse message(String message) {
+    
     this.message = message;
     return this;
   }
@@ -98,10 +111,16 @@ public class ModelApiResponse {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MESSAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "message")
+
   public String getMessage() {
     return message;
   }
 
+
+
   public void setMessage(String message) {
     this.message = message;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,13 +33,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Return")
 public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JacksonXmlProperty(localName = "return")
   @XmlElement(name = "return")
+  public static final String JSON_PROPERTY_RETURN = "return";
   private Integer _return;
 
+
   public ModelReturn _return(Integer _return) {
+    
     this._return = _return;
     return this;
   }
@@ -49,10 +50,16 @@ public class ModelReturn {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_RETURN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "return")
+
   public Integer getReturn() {
     return _return;
   }
 
+
+
   public void setReturn(Integer _return) {
     this._return = _return;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,31 +33,25 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Name")
 public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private Integer name;
 
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JacksonXmlProperty(localName = "snake_case")
   @XmlElement(name = "snake_case")
+  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
   private Integer snakeCase;
 
-  public static final String JSON_PROPERTY_PROPERTY = "property";
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JacksonXmlProperty(localName = "property")
   @XmlElement(name = "property")
+  public static final String JSON_PROPERTY_PROPERTY = "property";
   private String property;
 
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JacksonXmlProperty(localName = "123Number")
   @XmlElement(name = "123Number")
+  public static final String JSON_PROPERTY_123NUMBER = "123Number";
   private Integer _123number;
 
+
   public Name name(Integer name) {
+    
     this.name = name;
     return this;
   }
@@ -66,25 +61,40 @@ public class Name {
    * @return name
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "name")
+
   public Integer getName() {
     return name;
   }
 
+
+
   public void setName(Integer name) {
     this.name = name;
   }
 
+
    /**
    * Get snakeCase
    * @return snakeCase
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "snake_case")
+
   public Integer getSnakeCase() {
     return snakeCase;
   }
 
+
+
+
   public Name property(String property) {
+    
     this.property = property;
     return this;
   }
@@ -95,25 +105,38 @@ public class Name {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PROPERTY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "property")
+
   public String getProperty() {
     return property;
   }
 
+
+
   public void setProperty(String property) {
     this.property = property;
   }
 
+
    /**
    * Get _123number
    * @return _123number
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_123NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "123Number")
+
   public Integer get123number() {
     return _123number;
   }
 
 
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,13 +33,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "NumberOnly")
 public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JacksonXmlProperty(localName = "JustNumber")
   @XmlElement(name = "JustNumber")
+  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
   private BigDecimal justNumber;
 
+
   public NumberOnly justNumber(BigDecimal justNumber) {
+    
     this.justNumber = justNumber;
     return this;
   }
@@ -49,10 +50,16 @@ public class NumberOnly {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "JustNumber")
+
   public BigDecimal getJustNumber() {
     return justNumber;
   }
 
+
+
   public void setJustNumber(BigDecimal justNumber) {
     this.justNumber = justNumber;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,28 +33,20 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Order")
 public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JacksonXmlProperty(localName = "id")
   @XmlElement(name = "id")
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String JSON_PROPERTY_PET_ID = "petId";
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JacksonXmlProperty(localName = "petId")
   @XmlElement(name = "petId")
+  public static final String JSON_PROPERTY_PET_ID = "petId";
   private Long petId;
 
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JacksonXmlProperty(localName = "quantity")
   @XmlElement(name = "quantity")
+  public static final String JSON_PROPERTY_QUANTITY = "quantity";
   private Integer quantity;
 
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JacksonXmlProperty(localName = "shipDate")
   @XmlElement(name = "shipDate")
+  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
   private OffsetDateTime shipDate;
 
   /**
@@ -93,19 +86,17 @@ public class Order {
     }
   }
 
-  public static final String JSON_PROPERTY_STATUS = "status";
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JacksonXmlProperty(localName = "status")
   @XmlElement(name = "status")
+  public static final String JSON_PROPERTY_STATUS = "status";
   private StatusEnum status;
 
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JacksonXmlProperty(localName = "complete")
   @XmlElement(name = "complete")
+  public static final String JSON_PROPERTY_COMPLETE = "complete";
   private Boolean complete = false;
 
+
   public Order id(Long id) {
+    
     this.id = id;
     return this;
   }
@@ -116,15 +107,23 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "id")
+
   public Long getId() {
     return id;
   }
 
+
+
   public void setId(Long id) {
     this.id = id;
   }
 
+
   public Order petId(Long petId) {
+    
     this.petId = petId;
     return this;
   }
@@ -135,15 +134,23 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PET_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "petId")
+
   public Long getPetId() {
     return petId;
   }
 
+
+
   public void setPetId(Long petId) {
     this.petId = petId;
   }
 
+
   public Order quantity(Integer quantity) {
+    
     this.quantity = quantity;
     return this;
   }
@@ -154,15 +161,23 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_QUANTITY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "quantity")
+
   public Integer getQuantity() {
     return quantity;
   }
 
+
+
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
 
+
   public Order shipDate(OffsetDateTime shipDate) {
+    
     this.shipDate = shipDate;
     return this;
   }
@@ -173,15 +188,23 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "shipDate")
+
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
 
+
+
   public void setShipDate(OffsetDateTime shipDate) {
     this.shipDate = shipDate;
   }
 
+
   public Order status(StatusEnum status) {
+    
     this.status = status;
     return this;
   }
@@ -192,15 +215,23 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "status")
+
   public StatusEnum getStatus() {
     return status;
   }
 
+
+
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
 
+
   public Order complete(Boolean complete) {
+    
     this.complete = complete;
     return this;
   }
@@ -211,10 +242,16 @@ public class Order {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_COMPLETE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "complete")
+
   public Boolean getComplete() {
     return complete;
   }
 
+
+
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -32,25 +33,21 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "OuterComposite")
 public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JacksonXmlProperty(localName = "my_number")
   @XmlElement(name = "my_number")
+  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
   private BigDecimal myNumber;
 
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JacksonXmlProperty(localName = "my_string")
   @XmlElement(name = "my_string")
+  public static final String JSON_PROPERTY_MY_STRING = "my_string";
   private String myString;
 
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JacksonXmlProperty(localName = "my_boolean")
   @XmlElement(name = "my_boolean")
+  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
   private Boolean myBoolean;
 
+
   public OuterComposite myNumber(BigDecimal myNumber) {
+    
     this.myNumber = myNumber;
     return this;
   }
@@ -61,15 +58,23 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "my_number")
+
   public BigDecimal getMyNumber() {
     return myNumber;
   }
 
+
+
   public void setMyNumber(BigDecimal myNumber) {
     this.myNumber = myNumber;
   }
 
+
   public OuterComposite myString(String myString) {
+    
     this.myString = myString;
     return this;
   }
@@ -80,15 +85,23 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "my_string")
+
   public String getMyString() {
     return myString;
   }
 
+
+
   public void setMyString(String myString) {
     this.myString = myString;
   }
 
+
   public OuterComposite myBoolean(Boolean myBoolean) {
+    
     this.myBoolean = myBoolean;
     return this;
   }
@@ -99,10 +112,16 @@ public class OuterComposite {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "my_boolean")
+
   public Boolean getMyBoolean() {
     return myBoolean;
   }
 
+
+
   public void setMyBoolean(Boolean myBoolean) {
     this.myBoolean = myBoolean;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -35,44 +36,32 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Pet")
 public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JacksonXmlProperty(localName = "id")
   @XmlElement(name = "id")
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String JSON_PROPERTY_CATEGORY = "category";
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JacksonXmlProperty(localName = "category")
   @XmlElement(name = "category")
-  private Category category = null;
+  public static final String JSON_PROPERTY_CATEGORY = "category";
+  private Category category;
 
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls")
   // Is a container wrapped=true
   // items.name=photoUrls items.baseName=photoUrls items.xmlName= items.xmlNamespace=
   // items.example= items.type=String
   @XmlElement(name = "photoUrls")
   @XmlElementWrapper(name = "photoUrl")
+  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
   private List<String> photoUrls = new ArrayList<String>();
 
-  public static final String JSON_PROPERTY_TAGS = "tags";
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "tags")
   // Is a container wrapped=true
   // items.name=tags items.baseName=tags items.xmlName= items.xmlNamespace=
   // items.example= items.type=Tag
   @XmlElement(name = "tags")
   @XmlElementWrapper(name = "tag")
+  public static final String JSON_PROPERTY_TAGS = "tags";
   private List<Tag> tags = null;
 
   /**
@@ -112,13 +101,13 @@ public class Pet {
     }
   }
 
-  public static final String JSON_PROPERTY_STATUS = "status";
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JacksonXmlProperty(localName = "status")
   @XmlElement(name = "status")
+  public static final String JSON_PROPERTY_STATUS = "status";
   private StatusEnum status;
 
+
   public Pet id(Long id) {
+    
     this.id = id;
     return this;
   }
@@ -129,15 +118,23 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "id")
+
   public Long getId() {
     return id;
   }
 
+
+
   public void setId(Long id) {
     this.id = id;
   }
 
+
   public Pet category(Category category) {
+    
     this.category = category;
     return this;
   }
@@ -148,15 +145,23 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CATEGORY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "category")
+
   public Category getCategory() {
     return category;
   }
 
+
+
   public void setCategory(Category category) {
     this.category = category;
   }
 
+
   public Pet name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -166,15 +171,23 @@ public class Pet {
    * @return name
   **/
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }
 
+
   public Pet photoUrls(List<String> photoUrls) {
+    
     this.photoUrls = photoUrls;
     return this;
   }
@@ -189,15 +202,24 @@ public class Pet {
    * @return photoUrls
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls")
+
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
+
+
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
 
+
   public Pet tags(List<Tag> tags) {
+    
     this.tags = tags;
     return this;
   }
@@ -216,15 +238,24 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "tags")
+
   public List<Tag> getTags() {
     return tags;
   }
 
+
+
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
 
+
   public Pet status(StatusEnum status) {
+    
     this.status = status;
     return this;
   }
@@ -235,10 +266,16 @@ public class Pet {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty(JSON_PROPERTY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "status")
+
   public StatusEnum getStatus() {
     return status;
   }
 
+
+
   public void setStatus(StatusEnum status) {
     this.status = status;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,29 +32,34 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ReadOnlyFirst")
 public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JacksonXmlProperty(localName = "bar")
   @XmlElement(name = "bar")
+  public static final String JSON_PROPERTY_BAR = "bar";
   private String bar;
 
-  public static final String JSON_PROPERTY_BAZ = "baz";
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JacksonXmlProperty(localName = "baz")
   @XmlElement(name = "baz")
+  public static final String JSON_PROPERTY_BAZ = "baz";
   private String baz;
 
+
    /**
    * Get bar
    * @return bar
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAR)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "bar")
+
   public String getBar() {
     return bar;
   }
 
+
+
+
   public ReadOnlyFirst baz(String baz) {
+    
     this.baz = baz;
     return this;
   }
@@ -64,10 +70,16 @@ public class ReadOnlyFirst {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_BAZ)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "baz")
+
   public String getBaz() {
     return baz;
   }
 
+
+
   public void setBaz(String baz) {
     this.baz = baz;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,13 +32,13 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "$special[model.name]")
 public class SpecialModelName {
-  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "$special[property.name]")
   @XmlElement(name = "$special[property.name]")
+  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
   private Long $specialPropertyName;
 
+
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    
     this.$specialPropertyName = $specialPropertyName;
     return this;
   }
@@ -48,10 +49,16 @@ public class SpecialModelName {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "$special[property.name]")
+
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
 
+
+
   public void set$SpecialPropertyName(Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,19 +32,17 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Tag")
 public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JacksonXmlProperty(localName = "id")
   @XmlElement(name = "id")
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String JSON_PROPERTY_NAME = "name";
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JacksonXmlProperty(localName = "name")
   @XmlElement(name = "name")
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
+
   public Tag id(Long id) {
+    
     this.id = id;
     return this;
   }
@@ -54,15 +53,23 @@ public class Tag {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "id")
+
   public Long getId() {
     return id;
   }
 
+
+
   public void setId(Long id) {
     this.id = id;
   }
 
+
   public Tag name(String name) {
+    
     this.name = name;
     return this;
   }
@@ -73,10 +80,16 @@ public class Tag {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "name")
+
   public String getName() {
     return name;
   }
 
+
+
   public void setName(String name) {
     this.name = name;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,39 +35,32 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "TypeHolderDefault")
 public class TypeHolderDefault {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JacksonXmlProperty(localName = "string_item")
   @XmlElement(name = "string_item")
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem = "what";
 
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JacksonXmlProperty(localName = "number_item")
   @XmlElement(name = "number_item")
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
   private BigDecimal numberItem;
 
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JacksonXmlProperty(localName = "integer_item")
   @XmlElement(name = "integer_item")
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
   private Integer integerItem;
 
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JacksonXmlProperty(localName = "bool_item")
   @XmlElement(name = "bool_item")
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
   private Boolean boolItem = true;
 
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   // Is a container wrapped=false
   // items.name=arrayItem items.baseName=arrayItem items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "arrayItem")
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<Integer>();
 
+
   public TypeHolderDefault stringItem(String stringItem) {
+    
     this.stringItem = stringItem;
     return this;
   }
@@ -76,15 +70,23 @@ public class TypeHolderDefault {
    * @return stringItem
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "string_item")
+
   public String getStringItem() {
     return stringItem;
   }
 
+
+
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
   }
 
+
   public TypeHolderDefault numberItem(BigDecimal numberItem) {
+    
     this.numberItem = numberItem;
     return this;
   }
@@ -94,15 +96,23 @@ public class TypeHolderDefault {
    * @return numberItem
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "number_item")
+
   public BigDecimal getNumberItem() {
     return numberItem;
   }
 
+
+
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
   }
 
+
   public TypeHolderDefault integerItem(Integer integerItem) {
+    
     this.integerItem = integerItem;
     return this;
   }
@@ -112,15 +122,23 @@ public class TypeHolderDefault {
    * @return integerItem
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "integer_item")
+
   public Integer getIntegerItem() {
     return integerItem;
   }
 
+
+
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
   }
 
+
   public TypeHolderDefault boolItem(Boolean boolItem) {
+    
     this.boolItem = boolItem;
     return this;
   }
@@ -130,15 +148,23 @@ public class TypeHolderDefault {
    * @return boolItem
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "bool_item")
+
   public Boolean getBoolItem() {
     return boolItem;
   }
 
+
+
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
   }
 
+
   public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
+    
     this.arrayItem = arrayItem;
     return this;
   }
@@ -153,10 +179,15 @@ public class TypeHolderDefault {
    * @return arrayItem
   **/
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
 
+
+
   public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,39 +35,32 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "TypeHolderExample")
 public class TypeHolderExample {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JacksonXmlProperty(localName = "string_item")
   @XmlElement(name = "string_item")
+  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
   private String stringItem;
 
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JacksonXmlProperty(localName = "number_item")
   @XmlElement(name = "number_item")
+  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
   private BigDecimal numberItem;
 
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JacksonXmlProperty(localName = "integer_item")
   @XmlElement(name = "integer_item")
+  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
   private Integer integerItem;
 
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JacksonXmlProperty(localName = "bool_item")
   @XmlElement(name = "bool_item")
+  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
   private Boolean boolItem;
 
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   // Is a container wrapped=false
   // items.name=arrayItem items.baseName=arrayItem items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "arrayItem")
+  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
   private List<Integer> arrayItem = new ArrayList<Integer>();
 
+
   public TypeHolderExample stringItem(String stringItem) {
+    
     this.stringItem = stringItem;
     return this;
   }
@@ -76,15 +70,23 @@ public class TypeHolderExample {
    * @return stringItem
   **/
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "string_item")
+
   public String getStringItem() {
     return stringItem;
   }
 
+
+
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
   }
 
+
   public TypeHolderExample numberItem(BigDecimal numberItem) {
+    
     this.numberItem = numberItem;
     return this;
   }
@@ -94,15 +96,23 @@ public class TypeHolderExample {
    * @return numberItem
   **/
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "number_item")
+
   public BigDecimal getNumberItem() {
     return numberItem;
   }
 
+
+
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
   }
 
+
   public TypeHolderExample integerItem(Integer integerItem) {
+    
     this.integerItem = integerItem;
     return this;
   }
@@ -112,15 +122,23 @@ public class TypeHolderExample {
    * @return integerItem
   **/
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "integer_item")
+
   public Integer getIntegerItem() {
     return integerItem;
   }
 
+
+
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
   }
 
+
   public TypeHolderExample boolItem(Boolean boolItem) {
+    
     this.boolItem = boolItem;
     return this;
   }
@@ -130,15 +148,23 @@ public class TypeHolderExample {
    * @return boolItem
   **/
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  @JacksonXmlProperty(localName = "bool_item")
+
   public Boolean getBoolItem() {
     return boolItem;
   }
 
+
+
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
   }
 
+
   public TypeHolderExample arrayItem(List<Integer> arrayItem) {
+    
     this.arrayItem = arrayItem;
     return this;
   }
@@ -153,10 +179,15 @@ public class TypeHolderExample {
    * @return arrayItem
   **/
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
+  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
 
+
+
   public void setArrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -31,55 +32,41 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "User")
 public class User {
-  public static final String JSON_PROPERTY_ID = "id";
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JacksonXmlProperty(localName = "id")
   @XmlElement(name = "id")
+  public static final String JSON_PROPERTY_ID = "id";
   private Long id;
 
-  public static final String JSON_PROPERTY_USERNAME = "username";
-  @JsonProperty(JSON_PROPERTY_USERNAME)
-  @JacksonXmlProperty(localName = "username")
   @XmlElement(name = "username")
+  public static final String JSON_PROPERTY_USERNAME = "username";
   private String username;
 
-  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
-  @JacksonXmlProperty(localName = "firstName")
   @XmlElement(name = "firstName")
+  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
   private String firstName;
 
-  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  @JsonProperty(JSON_PROPERTY_LAST_NAME)
-  @JacksonXmlProperty(localName = "lastName")
   @XmlElement(name = "lastName")
+  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
   private String lastName;
 
-  public static final String JSON_PROPERTY_EMAIL = "email";
-  @JsonProperty(JSON_PROPERTY_EMAIL)
-  @JacksonXmlProperty(localName = "email")
   @XmlElement(name = "email")
+  public static final String JSON_PROPERTY_EMAIL = "email";
   private String email;
 
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JacksonXmlProperty(localName = "password")
   @XmlElement(name = "password")
+  public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
-  public static final String JSON_PROPERTY_PHONE = "phone";
-  @JsonProperty(JSON_PROPERTY_PHONE)
-  @JacksonXmlProperty(localName = "phone")
   @XmlElement(name = "phone")
+  public static final String JSON_PROPERTY_PHONE = "phone";
   private String phone;
 
-  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  @JsonProperty(JSON_PROPERTY_USER_STATUS)
-  @JacksonXmlProperty(localName = "userStatus")
   @XmlElement(name = "userStatus")
+  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
   private Integer userStatus;
 
+
   public User id(Long id) {
+    
     this.id = id;
     return this;
   }
@@ -90,15 +77,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "id")
+
   public Long getId() {
     return id;
   }
 
+
+
   public void setId(Long id) {
     this.id = id;
   }
 
+
   public User username(String username) {
+    
     this.username = username;
     return this;
   }
@@ -109,15 +104,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_USERNAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "username")
+
   public String getUsername() {
     return username;
   }
 
+
+
   public void setUsername(String username) {
     this.username = username;
   }
 
+
   public User firstName(String firstName) {
+    
     this.firstName = firstName;
     return this;
   }
@@ -128,15 +131,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "firstName")
+
   public String getFirstName() {
     return firstName;
   }
 
+
+
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
 
+
   public User lastName(String lastName) {
+    
     this.lastName = lastName;
     return this;
   }
@@ -147,15 +158,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_LAST_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "lastName")
+
   public String getLastName() {
     return lastName;
   }
 
+
+
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
 
+
   public User email(String email) {
+    
     this.email = email;
     return this;
   }
@@ -166,15 +185,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_EMAIL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "email")
+
   public String getEmail() {
     return email;
   }
 
+
+
   public void setEmail(String email) {
     this.email = email;
   }
 
+
   public User password(String password) {
+    
     this.password = password;
     return this;
   }
@@ -185,15 +212,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PASSWORD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "password")
+
   public String getPassword() {
     return password;
   }
 
+
+
   public void setPassword(String password) {
     this.password = password;
   }
 
+
   public User phone(String phone) {
+    
     this.phone = phone;
     return this;
   }
@@ -204,15 +239,23 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PHONE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "phone")
+
   public String getPhone() {
     return phone;
   }
 
+
+
   public void setPhone(String phone) {
     this.phone = phone;
   }
 
+
   public User userStatus(Integer userStatus) {
+    
     this.userStatus = userStatus;
     return this;
   }
@@ -223,10 +266,16 @@ public class User {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
+  @JsonProperty(JSON_PROPERTY_USER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "userStatus")
+
   public Integer getUserStatus() {
     return userStatus;
   }
 
+
+
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java

@@ -15,6 +15,7 @@ package org.openapitools.client.model;
 
 import java.util.Objects;
 import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
@@ -34,214 +35,157 @@ import javax.xml.bind.annotation.*;
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(namespace="http://a.com/schema", localName = "XmlItem")
 public class XmlItem {
-  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
-  @JacksonXmlProperty(isAttribute = true, localName = "attribute_string")
   @XmlAttribute(name = "attribute_string")
+  public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
   private String attributeString;
 
-  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
-  @JacksonXmlProperty(isAttribute = true, localName = "attribute_number")
   @XmlAttribute(name = "attribute_number")
+  public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number";
   private BigDecimal attributeNumber;
 
-  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
-  @JacksonXmlProperty(isAttribute = true, localName = "attribute_integer")
   @XmlAttribute(name = "attribute_integer")
+  public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer";
   private Integer attributeInteger;
 
-  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
-  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
-  @JacksonXmlProperty(isAttribute = true, localName = "attribute_boolean")
   @XmlAttribute(name = "attribute_boolean")
+  public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean";
   private Boolean attributeBoolean;
 
-  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
-  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "wrappedArray")
   // Is a container wrapped=true
   // items.name=wrappedArray items.baseName=wrappedArray items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "wrappedArray")
   @XmlElementWrapper(name = "wrapped_array")
+  public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array";
   private List<Integer> wrappedArray = null;
 
-  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
-  @JsonProperty(JSON_PROPERTY_NAME_STRING)
-  @JacksonXmlProperty(localName = "xml_name_string")
   @XmlElement(name = "xml_name_string")
+  public static final String JSON_PROPERTY_NAME_STRING = "name_string";
   private String nameString;
 
-  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
-  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
-  @JacksonXmlProperty(localName = "xml_name_number")
   @XmlElement(name = "xml_name_number")
+  public static final String JSON_PROPERTY_NAME_NUMBER = "name_number";
   private BigDecimal nameNumber;
 
-  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
-  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
-  @JacksonXmlProperty(localName = "xml_name_integer")
   @XmlElement(name = "xml_name_integer")
+  public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer";
   private Integer nameInteger;
 
-  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
-  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
-  @JacksonXmlProperty(localName = "xml_name_boolean")
   @XmlElement(name = "xml_name_boolean")
+  public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean";
   private Boolean nameBoolean;
 
-  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
-  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   // Is a container wrapped=false
   // items.name=nameArray items.baseName=nameArray items.xmlName=xml_name_array_item items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "xml_name_array_item")
+  public static final String JSON_PROPERTY_NAME_ARRAY = "name_array";
   private List<Integer> nameArray = null;
 
-  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
-  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
-  // items.xmlName=xml_name_wrapped_array_item
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "xml_name_wrapped_array_item")
   // Is a container wrapped=true
   // items.name=nameWrappedArray items.baseName=nameWrappedArray items.xmlName=xml_name_wrapped_array_item items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "xml_name_wrapped_array_item")
   @XmlElementWrapper(name = "xml_name_wrapped_array")
+  public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
   private List<Integer> nameWrappedArray = null;
 
-  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
-  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
-  @JacksonXmlProperty(localName = "prefix_string")
   @XmlElement(name = "prefix_string")
+  public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
   private String prefixString;
 
-  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
-  @JacksonXmlProperty(localName = "prefix_number")
   @XmlElement(name = "prefix_number")
+  public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number";
   private BigDecimal prefixNumber;
 
-  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
-  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
-  @JacksonXmlProperty(localName = "prefix_integer")
   @XmlElement(name = "prefix_integer")
+  public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer";
   private Integer prefixInteger;
 
-  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
-  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
-  @JacksonXmlProperty(localName = "prefix_boolean")
   @XmlElement(name = "prefix_boolean")
+  public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean";
   private Boolean prefixBoolean;
 
-  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
-  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   // Is a container wrapped=false
   // items.name=prefixArray items.baseName=prefixArray items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "prefixArray")
+  public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array";
   private List<Integer> prefixArray = null;
 
-  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
-  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "prefixWrappedArray")
   // Is a container wrapped=true
   // items.name=prefixWrappedArray items.baseName=prefixWrappedArray items.xmlName= items.xmlNamespace=
   // items.example= items.type=Integer
   @XmlElement(name = "prefixWrappedArray")
   @XmlElementWrapper(name = "prefix_wrapped_array")
+  public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
   private List<Integer> prefixWrappedArray = null;
 
-  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
-  @JacksonXmlProperty(namespace="http://a.com/schema", localName = "namespace_string")
   @XmlElement(namespace="http://a.com/schema", name = "namespace_string")
+  public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
   private String namespaceString;
 
-  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
-  @JacksonXmlProperty(namespace="http://b.com/schema", localName = "namespace_number")
   @XmlElement(namespace="http://b.com/schema", name = "namespace_number")
+  public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number";
   private BigDecimal namespaceNumber;
 
-  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
-  @JacksonXmlProperty(namespace="http://c.com/schema", localName = "namespace_integer")
   @XmlElement(namespace="http://c.com/schema", name = "namespace_integer")
+  public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer";
   private Integer namespaceInteger;
 
-  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
-  @JacksonXmlProperty(namespace="http://d.com/schema", localName = "namespace_boolean")
   @XmlElement(namespace="http://d.com/schema", name = "namespace_boolean")
+  public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean";
   private Boolean namespaceBoolean;
 
-  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   // Is a container wrapped=false
   // items.name=namespaceArray items.baseName=namespaceArray items.xmlName= items.xmlNamespace=http://e.com/schema
   // items.example= items.type=Integer
   @XmlElement(namespace="http://e.com/schema", name = "namespaceArray")
+  public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array";
   private List<Integer> namespaceArray = null;
 
-  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
-  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespaceWrappedArray")
   // Is a container wrapped=true
   // items.name=namespaceWrappedArray items.baseName=namespaceWrappedArray items.xmlName= items.xmlNamespace=http://g.com/schema
   // items.example= items.type=Integer
   @XmlElement(namespace="http://g.com/schema", name = "namespaceWrappedArray")
   @XmlElementWrapper(namespace="http://f.com/schema", name = "namespace_wrapped_array")
+  public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
   private List<Integer> namespaceWrappedArray = null;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
-  @JacksonXmlProperty(namespace="http://a.com/schema", localName = "prefix_ns_string")
   @XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string")
+  public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
   private String prefixNsString;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
-  @JacksonXmlProperty(namespace="http://b.com/schema", localName = "prefix_ns_number")
   @XmlElement(namespace="http://b.com/schema", name = "prefix_ns_number")
+  public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number";
   private BigDecimal prefixNsNumber;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
-  @JacksonXmlProperty(namespace="http://c.com/schema", localName = "prefix_ns_integer")
   @XmlElement(namespace="http://c.com/schema", name = "prefix_ns_integer")
+  public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer";
   private Integer prefixNsInteger;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
-  @JacksonXmlProperty(namespace="http://d.com/schema", localName = "prefix_ns_boolean")
   @XmlElement(namespace="http://d.com/schema", name = "prefix_ns_boolean")
+  public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean";
   private Boolean prefixNsBoolean;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   // Is a container wrapped=false
   // items.name=prefixNsArray items.baseName=prefixNsArray items.xmlName= items.xmlNamespace=http://e.com/schema
   // items.example= items.type=Integer
   @XmlElement(namespace="http://e.com/schema", name = "prefixNsArray")
+  public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array";
   private List<Integer> prefixNsArray = null;
 
-  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
-  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
-  // items.xmlName=
-  @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefixNsWrappedArray")
   // Is a container wrapped=true
   // items.name=prefixNsWrappedArray items.baseName=prefixNsWrappedArray items.xmlName= items.xmlNamespace=http://g.com/schema
   // items.example= items.type=Integer
   @XmlElement(namespace="http://g.com/schema", name = "prefixNsWrappedArray")
   @XmlElementWrapper(namespace="http://f.com/schema", name = "prefix_ns_wrapped_array")
+  public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
   private List<Integer> prefixNsWrappedArray = null;
 
+
   public XmlItem attributeString(String attributeString) {
+    
     this.attributeString = attributeString;
     return this;
   }
@@ -252,15 +196,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(isAttribute = true, localName = "attribute_string")
+
   public String getAttributeString() {
     return attributeString;
   }
 
+
+
   public void setAttributeString(String attributeString) {
     this.attributeString = attributeString;
   }
 
+
   public XmlItem attributeNumber(BigDecimal attributeNumber) {
+    
     this.attributeNumber = attributeNumber;
     return this;
   }
@@ -271,15 +223,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(isAttribute = true, localName = "attribute_number")
+
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
 
+
+
   public void setAttributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
   }
 
+
   public XmlItem attributeInteger(Integer attributeInteger) {
+    
     this.attributeInteger = attributeInteger;
     return this;
   }
@@ -290,15 +250,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(isAttribute = true, localName = "attribute_integer")
+
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
 
+
+
   public void setAttributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
   }
 
+
   public XmlItem attributeBoolean(Boolean attributeBoolean) {
+    
     this.attributeBoolean = attributeBoolean;
     return this;
   }
@@ -309,15 +277,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(isAttribute = true, localName = "attribute_boolean")
+
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
 
+
+
   public void setAttributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
   }
 
+
   public XmlItem wrappedArray(List<Integer> wrappedArray) {
+    
     this.wrappedArray = wrappedArray;
     return this;
   }
@@ -336,15 +312,24 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "wrappedArray")
+
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
 
+
+
   public void setWrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
   }
 
+
   public XmlItem nameString(String nameString) {
+    
     this.nameString = nameString;
     return this;
   }
@@ -355,15 +340,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "xml_name_string")
+
   public String getNameString() {
     return nameString;
   }
 
+
+
   public void setNameString(String nameString) {
     this.nameString = nameString;
   }
 
+
   public XmlItem nameNumber(BigDecimal nameNumber) {
+    
     this.nameNumber = nameNumber;
     return this;
   }
@@ -374,15 +367,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "xml_name_number")
+
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
 
+
+
   public void setNameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
   }
 
+
   public XmlItem nameInteger(Integer nameInteger) {
+    
     this.nameInteger = nameInteger;
     return this;
   }
@@ -393,15 +394,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "xml_name_integer")
+
   public Integer getNameInteger() {
     return nameInteger;
   }
 
+
+
   public void setNameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
   }
 
+
   public XmlItem nameBoolean(Boolean nameBoolean) {
+    
     this.nameBoolean = nameBoolean;
     return this;
   }
@@ -412,15 +421,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "xml_name_boolean")
+
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
 
+
+
   public void setNameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
   }
 
+
   public XmlItem nameArray(List<Integer> nameArray) {
+    
     this.nameArray = nameArray;
     return this;
   }
@@ -439,15 +456,22 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<Integer> getNameArray() {
     return nameArray;
   }
 
+
+
   public void setNameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
   }
 
+
   public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
+    
     this.nameWrappedArray = nameWrappedArray;
     return this;
   }
@@ -466,15 +490,24 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=xml_name_wrapped_array_item
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "xml_name_wrapped_array_item")
+
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
 
+
+
   public void setNameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
   }
 
+
   public XmlItem prefixString(String prefixString) {
+    
     this.prefixString = prefixString;
     return this;
   }
@@ -485,15 +518,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "prefix_string")
+
   public String getPrefixString() {
     return prefixString;
   }
 
+
+
   public void setPrefixString(String prefixString) {
     this.prefixString = prefixString;
   }
 
+
   public XmlItem prefixNumber(BigDecimal prefixNumber) {
+    
     this.prefixNumber = prefixNumber;
     return this;
   }
@@ -504,15 +545,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "prefix_number")
+
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
 
+
+
   public void setPrefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
   }
 
+
   public XmlItem prefixInteger(Integer prefixInteger) {
+    
     this.prefixInteger = prefixInteger;
     return this;
   }
@@ -523,15 +572,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "prefix_integer")
+
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
 
+
+
   public void setPrefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
   }
 
+
   public XmlItem prefixBoolean(Boolean prefixBoolean) {
+    
     this.prefixBoolean = prefixBoolean;
     return this;
   }
@@ -542,15 +599,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "prefix_boolean")
+
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
 
+
+
   public void setPrefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
   }
 
+
   public XmlItem prefixArray(List<Integer> prefixArray) {
+    
     this.prefixArray = prefixArray;
     return this;
   }
@@ -569,15 +634,22 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
 
+
+
   public void setPrefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
   }
 
+
   public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
+    
     this.prefixWrappedArray = prefixWrappedArray;
     return this;
   }
@@ -596,15 +668,24 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, localName = "prefixWrappedArray")
+
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
 
+
+
   public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
   }
 
+
   public XmlItem namespaceString(String namespaceString) {
+    
     this.namespaceString = namespaceString;
     return this;
   }
@@ -615,15 +696,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://a.com/schema", localName = "namespace_string")
+
   public String getNamespaceString() {
     return namespaceString;
   }
 
+
+
   public void setNamespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
   }
 
+
   public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
+    
     this.namespaceNumber = namespaceNumber;
     return this;
   }
@@ -634,15 +723,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://b.com/schema", localName = "namespace_number")
+
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
 
+
+
   public void setNamespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
   }
 
+
   public XmlItem namespaceInteger(Integer namespaceInteger) {
+    
     this.namespaceInteger = namespaceInteger;
     return this;
   }
@@ -653,15 +750,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://c.com/schema", localName = "namespace_integer")
+
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
 
+
+
   public void setNamespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
   }
 
+
   public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
+    
     this.namespaceBoolean = namespaceBoolean;
     return this;
   }
@@ -672,15 +777,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://d.com/schema", localName = "namespace_boolean")
+
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
 
+
+
   public void setNamespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
   }
 
+
   public XmlItem namespaceArray(List<Integer> namespaceArray) {
+    
     this.namespaceArray = namespaceArray;
     return this;
   }
@@ -699,15 +812,22 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
 
+
+
   public void setNamespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
   }
 
+
   public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    
     this.namespaceWrappedArray = namespaceWrappedArray;
     return this;
   }
@@ -726,15 +846,24 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespaceWrappedArray")
+
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
 
+
+
   public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
   }
 
+
   public XmlItem prefixNsString(String prefixNsString) {
+    
     this.prefixNsString = prefixNsString;
     return this;
   }
@@ -745,15 +874,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://a.com/schema", localName = "prefix_ns_string")
+
   public String getPrefixNsString() {
     return prefixNsString;
   }
 
+
+
   public void setPrefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
   }
 
+
   public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
+    
     this.prefixNsNumber = prefixNsNumber;
     return this;
   }
@@ -764,15 +901,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://b.com/schema", localName = "prefix_ns_number")
+
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
 
+
+
   public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
   }
 
+
   public XmlItem prefixNsInteger(Integer prefixNsInteger) {
+    
     this.prefixNsInteger = prefixNsInteger;
     return this;
   }
@@ -783,15 +928,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://c.com/schema", localName = "prefix_ns_integer")
+
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
 
+
+
   public void setPrefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
   }
 
+
   public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
+    
     this.prefixNsBoolean = prefixNsBoolean;
     return this;
   }
@@ -802,15 +955,23 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(namespace="http://d.com/schema", localName = "prefix_ns_boolean")
+
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
 
+
+
   public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
   }
 
+
   public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
+    
     this.prefixNsArray = prefixNsArray;
     return this;
   }
@@ -829,15 +990,22 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
 
+
+
   public void setPrefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
   }
 
+
   public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    
     this.prefixNsWrappedArray = prefixNsWrappedArray;
     return this;
   }
@@ -856,10 +1024,17 @@ public class XmlItem {
   **/
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  // items.xmlName=
+  @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefixNsWrappedArray")
+
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
 
+
+
   public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
   }