From 52341398142f5b44db805348caa4135e62527421 Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Mon, 7 Oct 2019 11:50:56 +0200 Subject: [PATCH] [java][client] Fix regression in Java XML serialization. Fixes #4014 (#4023) * Fix regression in Java XML serialization. Fixes #4014 * Also move JSON_PROPERTY_* declaration --- .../src/main/resources/Java/pojo.mustache | 10 ++-- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 22 +++---- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../org/openapitools/client/model/Animal.java | 4 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../client/model/ArrayOfNumberOnly.java | 2 +- .../openapitools/client/model/ArrayTest.java | 6 +- .../client/model/Capitalization.java | 12 ++-- .../org/openapitools/client/model/Cat.java | 2 +- .../openapitools/client/model/CatAllOf.java | 2 +- .../openapitools/client/model/Category.java | 4 +- .../openapitools/client/model/ClassModel.java | 2 +- .../org/openapitools/client/model/Client.java | 2 +- .../org/openapitools/client/model/Dog.java | 2 +- .../openapitools/client/model/DogAllOf.java | 2 +- .../openapitools/client/model/EnumArrays.java | 4 +- .../openapitools/client/model/EnumTest.java | 10 ++-- .../client/model/FileSchemaTestClass.java | 4 +- .../openapitools/client/model/FormatTest.java | 28 ++++----- .../client/model/HasOnlyReadOnly.java | 4 +- .../openapitools/client/model/MapTest.java | 8 +-- ...ropertiesAndAdditionalPropertiesClass.java | 6 +- .../client/model/Model200Response.java | 4 +- .../client/model/ModelApiResponse.java | 6 +- .../client/model/ModelReturn.java | 2 +- .../org/openapitools/client/model/Name.java | 8 +-- .../openapitools/client/model/NumberOnly.java | 2 +- .../org/openapitools/client/model/Order.java | 12 ++-- .../client/model/OuterComposite.java | 6 +- .../org/openapitools/client/model/Pet.java | 12 ++-- .../client/model/ReadOnlyFirst.java | 4 +- .../client/model/SpecialModelName.java | 2 +- .../org/openapitools/client/model/Tag.java | 4 +- .../client/model/TypeHolderDefault.java | 10 ++-- .../client/model/TypeHolderExample.java | 12 ++-- .../org/openapitools/client/model/User.java | 16 ++--- .../openapitools/client/model/XmlItem.java | 58 +++++++++---------- 43 files changed, 156 insertions(+), 154 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 309a42baced9..27bbed28420d 100644 --- 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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java index 1ab77fed738f..8e7cbfcf1b25 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java index 4c6150829cbc..21d7cddc977f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java index c4d8741f2456..3d77005056ff 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 893a831d603c..323234e05841 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-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 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 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 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 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<Integer> @XmlElement(name = "inner") - public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; private Map> 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<Object> @XmlElement(name = "inner") - public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; private Map> 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<String, String> @XmlElement(name = "inner") - public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; private Map> 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<String, Object> @XmlElement(name = "inner") - public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; private Map> 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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java index f6c3424388c5..a1697af5fdcb 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java index ae39a9f48e4c..2885d93234f9 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java index 897018cb53d7..44b7e8f4c753 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java index c8a94eea08b2..bc3f9aae2572 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java +++ b/samples/client/petstore/java/resttemplate-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 { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java index 9265b5317eec..1a1cba4a6829 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 11ed5ea28046..ff8f7245a293 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-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<BigDecimal> @XmlElement(name = "arrayArrayNumber") - public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; private List> arrayArrayNumber = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 6d8d8f6fdbd2..c20a3cce74ca 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/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 arrayNumber = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java index 5c82d3c89c1f..031eac54b211 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/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 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<Long> @XmlElement(name = "arrayArrayOfInteger") - public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; private List> 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<ReadOnlyFirst> @XmlElement(name = "arrayArrayOfModel") - public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; private List> arrayArrayOfModel = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java index 9dbf22d4ccf5..1ea4534169a4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java index 914ae0e1d6e2..f674ee10cf90 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java +++ b/samples/client/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java index d4787cee33bd..b932c985c324 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java index ba1daba69010..5d6fed6ea91b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java index 25d9c8d4f06f..391d1334534e 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java index ecb934696f09..bedf7d9c4347 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java index 0e198c2302f0..873dc141186a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java +++ b/samples/client/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java index f413def1dc3f..3b05cc3bd3a5 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java +++ b/samples/client/petstore/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/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java index 64939f3923df..49d707b1ee0a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/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 arrayEnum = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java index 0e979e564cbd..2027735cb9b9 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java @@ -78,8 +78,8 @@ public static EnumStringEnum fromValue(String value) { } } - @XmlElement(name = "enum_string") public static final String JSON_PROPERTY_ENUM_STRING = "enum_string"; + @XmlElement(name = "enum_string") private EnumStringEnum enumString; /** @@ -119,8 +119,8 @@ public static EnumStringRequiredEnum fromValue(String value) { } } - @XmlElement(name = "enum_string_required") public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required"; + @XmlElement(name = "enum_string_required") private EnumStringRequiredEnum enumStringRequired; /** @@ -158,8 +158,8 @@ public static EnumIntegerEnum fromValue(Integer value) { } } - @XmlElement(name = "enum_integer") public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer"; + @XmlElement(name = "enum_integer") private EnumIntegerEnum enumInteger; /** @@ -197,12 +197,12 @@ public static EnumNumberEnum fromValue(Double value) { } } - @XmlElement(name = "enum_number") public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number"; + @XmlElement(name = "enum_number") private EnumNumberEnum enumNumber; - @XmlElement(name = "outerEnum") public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum"; + @XmlElement(name = "outerEnum") private OuterEnum outerEnum; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 9690372c1ceb..99e581462cfa 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,15 +39,15 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "FileSchemaTestClass") public class FileSchemaTestClass { - @XmlElement(name = "file") public static final String JSON_PROPERTY_FILE = "file"; + @XmlElement(name = "file") private java.io.File file; + public static final String JSON_PROPERTY_FILES = "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 files = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java index ecd05624e46d..3c8b4fcb260c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java @@ -54,60 +54,60 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "FormatTest") public class FormatTest { - @XmlElement(name = "integer") public static final String JSON_PROPERTY_INTEGER = "integer"; + @XmlElement(name = "integer") private Integer integer; - @XmlElement(name = "int32") public static final String JSON_PROPERTY_INT32 = "int32"; + @XmlElement(name = "int32") private Integer int32; - @XmlElement(name = "int64") public static final String JSON_PROPERTY_INT64 = "int64"; + @XmlElement(name = "int64") private Long int64; - @XmlElement(name = "number") public static final String JSON_PROPERTY_NUMBER = "number"; + @XmlElement(name = "number") private BigDecimal number; - @XmlElement(name = "float") public static final String JSON_PROPERTY_FLOAT = "float"; + @XmlElement(name = "float") private Float _float; - @XmlElement(name = "double") public static final String JSON_PROPERTY_DOUBLE = "double"; + @XmlElement(name = "double") private Double _double; - @XmlElement(name = "string") public static final String JSON_PROPERTY_STRING = "string"; + @XmlElement(name = "string") private String string; - @XmlElement(name = "byte") public static final String JSON_PROPERTY_BYTE = "byte"; + @XmlElement(name = "byte") private byte[] _byte; - @XmlElement(name = "binary") public static final String JSON_PROPERTY_BINARY = "binary"; + @XmlElement(name = "binary") private File binary; - @XmlElement(name = "date") public static final String JSON_PROPERTY_DATE = "date"; + @XmlElement(name = "date") private LocalDate date; - @XmlElement(name = "dateTime") public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + @XmlElement(name = "dateTime") private OffsetDateTime dateTime; - @XmlElement(name = "uuid") public static final String JSON_PROPERTY_UUID = "uuid"; + @XmlElement(name = "uuid") private UUID uuid; - @XmlElement(name = "password") public static final String JSON_PROPERTY_PASSWORD = "password"; + @XmlElement(name = "password") private String password; - @XmlElement(name = "BigDecimal") public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal"; + @XmlElement(name = "BigDecimal") private BigDecimal bigDecimal; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java index b7770eed1bed..b3b1db0f33f7 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java @@ -37,12 +37,12 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "HasOnlyReadOnly") public class HasOnlyReadOnly { - @XmlElement(name = "bar") public static final String JSON_PROPERTY_BAR = "bar"; + @XmlElement(name = "bar") private String bar; - @XmlElement(name = "foo") public static final String JSON_PROPERTY_FOO = "foo"; + @XmlElement(name = "foo") private String foo; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java index d309e855cfee..3a418ffb1399 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java @@ -42,11 +42,11 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "MapTest") public class MapTest { + public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "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> mapMapOfString = null; /** @@ -84,25 +84,25 @@ public static InnerEnum fromValue(String value) { } } + public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "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 mapOfEnumString = null; + public static final String JSON_PROPERTY_DIRECT_MAP = "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 directMap = null; + public static final String JSON_PROPERTY_INDIRECT_MAP = "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 indirectMap = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 94d3c51ce11b..8270fdd3d085 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -44,19 +44,19 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "MixedPropertiesAndAdditionalPropertiesClass") public class MixedPropertiesAndAdditionalPropertiesClass { - @XmlElement(name = "uuid") public static final String JSON_PROPERTY_UUID = "uuid"; + @XmlElement(name = "uuid") private UUID uuid; - @XmlElement(name = "dateTime") public static final String JSON_PROPERTY_DATE_TIME = "dateTime"; + @XmlElement(name = "dateTime") private OffsetDateTime dateTime; + public static final String JSON_PROPERTY_MAP = "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 map = null; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java index 255a2fe8c704..c4f17d9a8526 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java @@ -38,12 +38,12 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Name") public class Model200Response { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private Integer name; - @XmlElement(name = "class") public static final String JSON_PROPERTY_PROPERTY_CLASS = "class"; + @XmlElement(name = "class") private String propertyClass; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java index 5b968f3aac8f..7ca9db801516 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java @@ -38,16 +38,16 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "ModelApiResponse") public class ModelApiResponse { - @XmlElement(name = "code") public static final String JSON_PROPERTY_CODE = "code"; + @XmlElement(name = "code") private Integer code; - @XmlElement(name = "type") public static final String JSON_PROPERTY_TYPE = "type"; + @XmlElement(name = "type") private String type; - @XmlElement(name = "message") public static final String JSON_PROPERTY_MESSAGE = "message"; + @XmlElement(name = "message") private String message; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java index 20deeb9358df..fa74761c4eb4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java @@ -37,8 +37,8 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Return") public class ModelReturn { - @XmlElement(name = "return") public static final String JSON_PROPERTY_RETURN = "return"; + @XmlElement(name = "return") private Integer _return; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java index 5a9d2d180379..f99499966504 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java @@ -40,20 +40,20 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Name") public class Name { - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private Integer name; - @XmlElement(name = "snake_case") public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case"; + @XmlElement(name = "snake_case") private Integer snakeCase; - @XmlElement(name = "property") public static final String JSON_PROPERTY_PROPERTY = "property"; + @XmlElement(name = "property") private String property; - @XmlElement(name = "123Number") public static final String JSON_PROPERTY_123NUMBER = "123Number"; + @XmlElement(name = "123Number") private Integer _123number; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java index 80346db3f821..57227fd93d10 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java @@ -37,8 +37,8 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "NumberOnly") public class NumberOnly { - @XmlElement(name = "JustNumber") public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber"; + @XmlElement(name = "JustNumber") private BigDecimal justNumber; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java index 18ab19f96716..42b0244a11c3 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java @@ -42,20 +42,20 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Order") public class Order { - @XmlElement(name = "id") public static final String JSON_PROPERTY_ID = "id"; + @XmlElement(name = "id") private Long id; - @XmlElement(name = "petId") public static final String JSON_PROPERTY_PET_ID = "petId"; + @XmlElement(name = "petId") private Long petId; - @XmlElement(name = "quantity") public static final String JSON_PROPERTY_QUANTITY = "quantity"; + @XmlElement(name = "quantity") private Integer quantity; - @XmlElement(name = "shipDate") public static final String JSON_PROPERTY_SHIP_DATE = "shipDate"; + @XmlElement(name = "shipDate") private OffsetDateTime shipDate; /** @@ -95,12 +95,12 @@ public static StatusEnum fromValue(String value) { } } - @XmlElement(name = "status") public static final String JSON_PROPERTY_STATUS = "status"; + @XmlElement(name = "status") private StatusEnum status; - @XmlElement(name = "complete") public static final String JSON_PROPERTY_COMPLETE = "complete"; + @XmlElement(name = "complete") private Boolean complete = false; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java index 77f0ff1aba51..5ffdea475d29 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java @@ -39,16 +39,16 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "OuterComposite") public class OuterComposite { - @XmlElement(name = "my_number") public static final String JSON_PROPERTY_MY_NUMBER = "my_number"; + @XmlElement(name = "my_number") private BigDecimal myNumber; - @XmlElement(name = "my_string") public static final String JSON_PROPERTY_MY_STRING = "my_string"; + @XmlElement(name = "my_string") private String myString; - @XmlElement(name = "my_boolean") public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean"; + @XmlElement(name = "my_boolean") private Boolean myBoolean; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java index 98bcda421faa..065a5110934d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java @@ -45,32 +45,32 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Pet") public class Pet { - @XmlElement(name = "id") public static final String JSON_PROPERTY_ID = "id"; + @XmlElement(name = "id") private Long id; - @XmlElement(name = "category") public static final String JSON_PROPERTY_CATEGORY = "category"; + @XmlElement(name = "category") private Category category; - @XmlElement(name = "name") public static final String JSON_PROPERTY_NAME = "name"; + @XmlElement(name = "name") private String name; + public static final String JSON_PROPERTY_PHOTO_URLS = "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 photoUrls = new ArrayList(); + public static final String JSON_PROPERTY_TAGS = "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 tags = null; /** @@ -110,8 +110,8 @@ public static StatusEnum fromValue(String value) { } } - @XmlElement(name = "status") public static final String JSON_PROPERTY_STATUS = "status"; + @XmlElement(name = "status") private StatusEnum status; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java index 6b9493b2284a..3221e8a62b20 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java @@ -37,12 +37,12 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "ReadOnlyFirst") public class ReadOnlyFirst { - @XmlElement(name = "bar") public static final String JSON_PROPERTY_BAR = "bar"; + @XmlElement(name = "bar") private String bar; - @XmlElement(name = "baz") public static final String JSON_PROPERTY_BAZ = "baz"; + @XmlElement(name = "baz") private String baz; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java index 8c48493002e8..1c7603ec4dc2 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java @@ -36,8 +36,8 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "$special[model.name]") public class SpecialModelName { - @XmlElement(name = "$special[property.name]") public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]"; + @XmlElement(name = "$special[property.name]") private Long $specialPropertyName; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java index 376ac030ed6f..54a473f799e1 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java @@ -37,12 +37,12 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "Tag") public class Tag { - @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; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 74894489c00c..923a0522f40f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -43,27 +43,27 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "TypeHolderDefault") public class TypeHolderDefault { - @XmlElement(name = "string_item") public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; + @XmlElement(name = "string_item") private String stringItem = "what"; - @XmlElement(name = "number_item") public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item"; + @XmlElement(name = "number_item") private BigDecimal numberItem; - @XmlElement(name = "integer_item") public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item"; + @XmlElement(name = "integer_item") private Integer integerItem; - @XmlElement(name = "bool_item") public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item"; + @XmlElement(name = "bool_item") private Boolean boolItem = true; + public static final String JSON_PROPERTY_ARRAY_ITEM = "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 arrayItem = new ArrayList(); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java index 7508b3fe96ad..e8f458699160 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -44,31 +44,31 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "TypeHolderExample") public class TypeHolderExample { - @XmlElement(name = "string_item") public static final String JSON_PROPERTY_STRING_ITEM = "string_item"; + @XmlElement(name = "string_item") private String stringItem; - @XmlElement(name = "number_item") public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item"; + @XmlElement(name = "number_item") private BigDecimal numberItem; - @XmlElement(name = "float_item") public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item"; + @XmlElement(name = "float_item") private Float floatItem; - @XmlElement(name = "integer_item") public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item"; + @XmlElement(name = "integer_item") private Integer integerItem; - @XmlElement(name = "bool_item") public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item"; + @XmlElement(name = "bool_item") private Boolean boolItem; + public static final String JSON_PROPERTY_ARRAY_ITEM = "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 arrayItem = new ArrayList(); diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java index 6bd7b43bc9d1..ffe7d14f3b26 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java @@ -43,36 +43,36 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(localName = "User") public class User { - @XmlElement(name = "id") public static final String JSON_PROPERTY_ID = "id"; + @XmlElement(name = "id") private Long id; - @XmlElement(name = "username") public static final String JSON_PROPERTY_USERNAME = "username"; + @XmlElement(name = "username") private String username; - @XmlElement(name = "firstName") public static final String JSON_PROPERTY_FIRST_NAME = "firstName"; + @XmlElement(name = "firstName") private String firstName; - @XmlElement(name = "lastName") public static final String JSON_PROPERTY_LAST_NAME = "lastName"; + @XmlElement(name = "lastName") private String lastName; - @XmlElement(name = "email") public static final String JSON_PROPERTY_EMAIL = "email"; + @XmlElement(name = "email") private String email; - @XmlElement(name = "password") public static final String JSON_PROPERTY_PASSWORD = "password"; + @XmlElement(name = "password") private String password; - @XmlElement(name = "phone") public static final String JSON_PROPERTY_PHONE = "phone"; + @XmlElement(name = "phone") private String phone; - @XmlElement(name = "userStatus") public static final String JSON_PROPERTY_USER_STATUS = "userStatus"; + @XmlElement(name = "userStatus") private Integer userStatus; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java index 37e961474be9..5bdc87bc364b 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java @@ -67,152 +67,152 @@ @XmlAccessorType(XmlAccessType.FIELD) @JacksonXmlRootElement(namespace="http://a.com/schema", localName = "XmlItem") public class XmlItem { - @XmlAttribute(name = "attribute_string") public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string"; + @XmlAttribute(name = "attribute_string") private String attributeString; - @XmlAttribute(name = "attribute_number") public static final String JSON_PROPERTY_ATTRIBUTE_NUMBER = "attribute_number"; + @XmlAttribute(name = "attribute_number") private BigDecimal attributeNumber; - @XmlAttribute(name = "attribute_integer") public static final String JSON_PROPERTY_ATTRIBUTE_INTEGER = "attribute_integer"; + @XmlAttribute(name = "attribute_integer") private Integer attributeInteger; - @XmlAttribute(name = "attribute_boolean") public static final String JSON_PROPERTY_ATTRIBUTE_BOOLEAN = "attribute_boolean"; + @XmlAttribute(name = "attribute_boolean") private Boolean attributeBoolean; + public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; // 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 wrappedArray = null; - @XmlElement(name = "xml_name_string") public static final String JSON_PROPERTY_NAME_STRING = "name_string"; + @XmlElement(name = "xml_name_string") private String nameString; - @XmlElement(name = "xml_name_number") public static final String JSON_PROPERTY_NAME_NUMBER = "name_number"; + @XmlElement(name = "xml_name_number") private BigDecimal nameNumber; - @XmlElement(name = "xml_name_integer") public static final String JSON_PROPERTY_NAME_INTEGER = "name_integer"; + @XmlElement(name = "xml_name_integer") private Integer nameInteger; - @XmlElement(name = "xml_name_boolean") public static final String JSON_PROPERTY_NAME_BOOLEAN = "name_boolean"; + @XmlElement(name = "xml_name_boolean") private Boolean nameBoolean; + public static final String JSON_PROPERTY_NAME_ARRAY = "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 nameArray = null; + public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; // 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 nameWrappedArray = null; - @XmlElement(name = "prefix_string") public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; + @XmlElement(name = "prefix_string") private String prefixString; - @XmlElement(name = "prefix_number") public static final String JSON_PROPERTY_PREFIX_NUMBER = "prefix_number"; + @XmlElement(name = "prefix_number") private BigDecimal prefixNumber; - @XmlElement(name = "prefix_integer") public static final String JSON_PROPERTY_PREFIX_INTEGER = "prefix_integer"; + @XmlElement(name = "prefix_integer") private Integer prefixInteger; - @XmlElement(name = "prefix_boolean") public static final String JSON_PROPERTY_PREFIX_BOOLEAN = "prefix_boolean"; + @XmlElement(name = "prefix_boolean") private Boolean prefixBoolean; + public static final String JSON_PROPERTY_PREFIX_ARRAY = "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 prefixArray = null; + public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; // 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 prefixWrappedArray = null; - @XmlElement(namespace="http://a.com/schema", name = "namespace_string") public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; + @XmlElement(namespace="http://a.com/schema", name = "namespace_string") private String namespaceString; - @XmlElement(namespace="http://b.com/schema", name = "namespace_number") public static final String JSON_PROPERTY_NAMESPACE_NUMBER = "namespace_number"; + @XmlElement(namespace="http://b.com/schema", name = "namespace_number") private BigDecimal namespaceNumber; - @XmlElement(namespace="http://c.com/schema", name = "namespace_integer") public static final String JSON_PROPERTY_NAMESPACE_INTEGER = "namespace_integer"; + @XmlElement(namespace="http://c.com/schema", name = "namespace_integer") private Integer namespaceInteger; - @XmlElement(namespace="http://d.com/schema", name = "namespace_boolean") public static final String JSON_PROPERTY_NAMESPACE_BOOLEAN = "namespace_boolean"; + @XmlElement(namespace="http://d.com/schema", name = "namespace_boolean") private Boolean namespaceBoolean; + public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "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 namespaceArray = null; + public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; // 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 namespaceWrappedArray = null; - @XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string") public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; + @XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string") private String prefixNsString; - @XmlElement(namespace="http://b.com/schema", name = "prefix_ns_number") public static final String JSON_PROPERTY_PREFIX_NS_NUMBER = "prefix_ns_number"; + @XmlElement(namespace="http://b.com/schema", name = "prefix_ns_number") private BigDecimal prefixNsNumber; - @XmlElement(namespace="http://c.com/schema", name = "prefix_ns_integer") public static final String JSON_PROPERTY_PREFIX_NS_INTEGER = "prefix_ns_integer"; + @XmlElement(namespace="http://c.com/schema", name = "prefix_ns_integer") private Integer prefixNsInteger; - @XmlElement(namespace="http://d.com/schema", name = "prefix_ns_boolean") public static final String JSON_PROPERTY_PREFIX_NS_BOOLEAN = "prefix_ns_boolean"; + @XmlElement(namespace="http://d.com/schema", name = "prefix_ns_boolean") private Boolean prefixNsBoolean; + public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "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 prefixNsArray = null; + public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; // 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 prefixNsWrappedArray = null;