[java][client] Fix regression in Java XML serialization. Fixes #4014 (#…

…4023) * Fix regression in Java XML serialization. Fixes #4014 * Also move JSON_PROPERTY_* declaration
OpenAPITools · Oct 7, 2019 · 5234139 · 5234139
1 parent 6082dd2
commit 5234139
Show file tree

Hide file tree

Showing 43 changed files with 156 additions and 154 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -26,6 +26,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
+  {{#gson}}
+  public static final String SERIALIZED_NAME_{{nameInSnakeCase}} = "{{baseName}}";
+  {{/gson}}
+  {{#jackson}}
+  public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
+  {{/jackson}}
   {{#withXml}}
   {{#isXmlAttribute}}
   @XmlAttribute(name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
@@ -48,12 +54,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/isXmlAttribute}}
   {{/withXml}}
   {{#gson}}
-  public static final String SERIALIZED_NAME_{{nameInSnakeCase}} = "{{baseName}}";
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
   {{/gson}}
-  {{#jackson}}
-  public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
-  {{/jackson}}
   {{#vendorExtensions.isJacksonOptionalNullable}}
   {{#isContainer}}
   private JsonNullable<{{{datatypeWithEnum}}}> {{name}} = JsonNullable.<{{{datatypeWithEnum}}}>undefined();

diff --git a/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesAnyType")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...mplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/...mplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -39,8 +39,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesArray")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesBoolean")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...mplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/...mplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -50,72 +50,72 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
 public class AdditionalPropertiesClass {
+  public static final String JSON_PROPERTY_MAP_STRING = "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";
   // 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";
   // 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";
   // 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";
   // 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";
   // 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";
   // 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";
   // 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;
 
-  @XmlElement(name = "anytype_1")
   public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
+  @XmlElement(name = "anytype_1")
   private Object anytype1;
 
-  @XmlElement(name = "anytype_2")
   public static final String JSON_PROPERTY_ANYTYPE2 = "anytype_2";
+  @XmlElement(name = "anytype_2")
   private Object anytype2;
 
-  @XmlElement(name = "anytype_3")
   public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
+  @XmlElement(name = "anytype_3")
   private Object anytype3;
 
 

diff --git a/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/...late-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesInteger")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -39,8 +39,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesNumber")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesObject")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/...plate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "AdditionalPropertiesString")
 public class AdditionalPropertiesString extends HashMap<String, String> {
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name;
 
 

diff --git a/...etstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/...etstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
@@ -45,12 +45,12 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Animal")
 public class Animal {
-  @XmlElement(name = "className")
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
+  @XmlElement(name = "className")
   private String className;
 
-  @XmlElement(name = "color")
   public static final String JSON_PROPERTY_COLOR = "color";
+  @XmlElement(name = "color")
   private String color = "red";
 
 

diff --git a/...emplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/...emplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -39,11 +39,11 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
 public class ArrayOfArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   // Is a container wrapped=false
   // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
   // items.example= items.type=List&lt;BigDecimal&gt;
   @XmlElement(name = "arrayArrayNumber")
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
 

diff --git a/...a/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/...a/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -39,11 +39,11 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
 public class ArrayOfNumberOnly {
+  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
   // 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;
 
 

diff --git a/...tore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/...tore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -41,25 +41,25 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ArrayTest")
 public class ArrayTest {
+  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "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";
   // 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";
   // 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;
 
 

diff --git a/...java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/...java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -41,28 +41,28 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Capitalization")
 public class Capitalization {
-  @XmlElement(name = "smallCamel")
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
+  @XmlElement(name = "smallCamel")
   private String smallCamel;
 
-  @XmlElement(name = "CapitalCamel")
   public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
+  @XmlElement(name = "CapitalCamel")
   private String capitalCamel;
 
-  @XmlElement(name = "small_Snake")
   public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
+  @XmlElement(name = "small_Snake")
   private String smallSnake;
 
-  @XmlElement(name = "Capital_Snake")
   public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
+  @XmlElement(name = "Capital_Snake")
   private String capitalSnake;
 
-  @XmlElement(name = "SCA_ETH_Flow_Points")
   public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
+  @XmlElement(name = "SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @XmlElement(name = "ATT_NAME")
   public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
+  @XmlElement(name = "ATT_NAME")
   private String ATT_NAME;
 
 

diff --git a/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Cat")
 public class Cat extends Animal {
-  @XmlElement(name = "declawed")
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  @XmlElement(name = "declawed")
   private Boolean declawed;
 
 

diff --git a/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -36,8 +36,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "CatAllOf")
 public class CatAllOf {
-  @XmlElement(name = "declawed")
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
+  @XmlElement(name = "declawed")
   private Boolean declawed;
 
 

diff --git a/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
@@ -37,12 +37,12 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Category")
 public class Category {
-  @XmlElement(name = "id")
   public static final String JSON_PROPERTY_ID = "id";
+  @XmlElement(name = "id")
   private Long id;
 
-  @XmlElement(name = "name")
   public static final String JSON_PROPERTY_NAME = "name";
+  @XmlElement(name = "name")
   private String name = "default-name";
 
 

diff --git a/...ore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/...ore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -37,8 +37,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "ClassModel")
 public class ClassModel {
-  @XmlElement(name = "_class")
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
+  @XmlElement(name = "_class")
   private String propertyClass;
 
 

diff --git a/...etstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/...etstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
@@ -36,8 +36,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Client")
 public class Client {
-  @XmlElement(name = "client")
   public static final String JSON_PROPERTY_CLIENT = "client";
+  @XmlElement(name = "client")
   private String client;
 
 

diff --git a/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -38,8 +38,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "Dog")
 public class Dog extends Animal {
-  @XmlElement(name = "breed")
   public static final String JSON_PROPERTY_BREED = "breed";
+  @XmlElement(name = "breed")
   private String breed;
 
 

diff --git a/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/...store/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -36,8 +36,8 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 @JacksonXmlRootElement(localName = "DogAllOf")
 public class DogAllOf {
-  @XmlElement(name = "breed")
   public static final String JSON_PROPERTY_BREED = "breed";
+  @XmlElement(name = "breed")
   private String breed;
 
 

diff --git a/...ore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/...ore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -74,8 +74,8 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @XmlElement(name = "just_symbol")
   public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
+  @XmlElement(name = "just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -113,11 +113,11 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
+  public static final String JSON_PROPERTY_ARRAY_ENUM = "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;