From cf713a9f3675d164659f1343f10f787b4a2a7277 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 3 Apr 2023 08:14:04 +0200 Subject: [PATCH 1/3] always use @JacksonXmlElementWrapper and read xml data from referenced schema based on https://github.com/OpenAPITools/openapi-generator/pull/5371 --- .../openapitools/codegen/DefaultCodegen.java | 40 ++++++++++++------- .../Java/jackson_annotations.mustache | 7 ++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index a3c1bef3db1c..539229fc5179 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3870,14 +3870,6 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo property.isNullable = p.getNullable(); } - if (p.getXml() != null) { - if (p.getXml().getAttribute() != null) { - property.isXmlAttribute = p.getXml().getAttribute(); - } - property.xmlPrefix = p.getXml().getPrefix(); - property.xmlName = p.getXml().getName(); - property.xmlNamespace = p.getXml().getNamespace(); - } if (p.getExtensions() != null && !p.getExtensions().isEmpty()) { property.getVendorExtensions().putAll(p.getExtensions()); } else if (p.get$ref() != null) { @@ -3927,6 +3919,32 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo property.isNullable = (Boolean) referencedSchema.getExtensions().get("x-nullable"); } + final XML referencedSchemaXml = referencedSchema.getXml(); + + if (referencedSchemaXml != null) { + property.xmlName = referencedSchemaXml.getName(); + property.xmlNamespace = referencedSchemaXml.getNamespace(); + property.xmlPrefix = referencedSchemaXml.getPrefix(); + if (referencedSchemaXml.getAttribute() != null) { + property.isXmlAttribute = referencedSchemaXml.getAttribute(); + } + if (referencedSchemaXml.getWrapped() != null) { + property.isXmlWrapped = referencedSchemaXml.getWrapped(); + } + } + + if (p.getXml() != null) { + if (p.getXml().getAttribute() != null) { + property.isXmlAttribute = p.getXml().getAttribute(); + } + if (p.getXml().getWrapped() != null) { + property.isXmlWrapped = p.getXml().getWrapped(); + } + property.xmlPrefix = p.getXml().getPrefix(); + property.xmlName = p.getXml().getName(); + property.xmlNamespace = p.getXml().getNamespace(); + } + property.dataType = getTypeDeclaration(p); property.dataFormat = p.getFormat(); property.baseType = getSchemaType(p); @@ -3961,12 +3979,6 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo property.containerType = "array"; } property.baseType = getSchemaType(p); - if (p.getXml() != null) { - property.isXmlWrapped = p.getXml().getWrapped() != null && p.getXml().getWrapped(); - property.xmlPrefix = p.getXml().getPrefix(); - property.xmlNamespace = p.getXml().getNamespace(); - property.xmlName = p.getXml().getName(); - } // handle inner property String itemName = getItemsName(p, name); diff --git a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache index ccde126f54eb..77cb62afd404 100644 --- a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache +++ b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache @@ -11,9 +11,8 @@ @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") {{/isContainer}} {{#isContainer}} - {{#isXmlWrapped}} - // items.xmlName={{items.xmlName}} - @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}") - {{/isXmlWrapped}} + // xmlName={{xmlName}} + @JacksonXmlProperty({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/xmlName}}") + @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}{{#xmlNamespace}}, namespace="{{.}}"{{/xmlNamespace}}{{#isXmlWrapped}}, localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{/isXmlWrapped}}) {{/isContainer}} {{/withXml}} \ No newline at end of file From 0a7ed03245af83849899de82913669afe9d19f59 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Mon, 3 Apr 2023 09:24:28 +0200 Subject: [PATCH 2/3] run generate-samples.sh --- .../model/AdditionalPropertiesClass.java | 48 ++++++++++++ .../model/ArrayOfArrayOfNumberOnly.java | 6 ++ .../client/model/ArrayOfNumberOnly.java | 6 ++ .../openapitools/client/model/ArrayTest.java | 18 +++++ .../openapitools/client/model/EnumArrays.java | 6 ++ .../client/model/FileSchemaTestClass.java | 6 ++ .../openapitools/client/model/MapTest.java | 24 ++++++ ...ropertiesAndAdditionalPropertiesClass.java | 6 ++ .../org/openapitools/client/model/Pet.java | 30 ++++---- .../client/model/TypeHolderDefault.java | 6 ++ .../client/model/TypeHolderExample.java | 6 ++ .../openapitools/client/model/XmlItem.java | 74 ++++++++++++++----- .../main/java/org/openapitools/model/Pet.java | 2 +- 13 files changed, 204 insertions(+), 34 deletions(-) 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 75fe8a77fcf0..dd9292478324 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 @@ -144,6 +144,9 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_string") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMapString() { return mapString; @@ -152,6 +155,9 @@ public Map getMapString() { @JsonProperty(JSON_PROPERTY_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_string") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapString(Map mapString) { this.mapString = mapString; } @@ -178,6 +184,9 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_number") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMapNumber() { return mapNumber; @@ -186,6 +195,9 @@ public Map getMapNumber() { @JsonProperty(JSON_PROPERTY_MAP_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_number") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapNumber(Map mapNumber) { this.mapNumber = mapNumber; } @@ -212,6 +224,9 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_integer") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMapInteger() { return mapInteger; @@ -220,6 +235,9 @@ public Map getMapInteger() { @JsonProperty(JSON_PROPERTY_MAP_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_integer") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapInteger(Map mapInteger) { this.mapInteger = mapInteger; } @@ -246,6 +264,9 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_boolean") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMapBoolean() { return mapBoolean; @@ -254,6 +275,9 @@ public Map getMapBoolean() { @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_boolean") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapBoolean(Map mapBoolean) { this.mapBoolean = mapBoolean; } @@ -280,6 +304,9 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { return mapArrayInteger; @@ -288,6 +315,9 @@ public Map> getMapArrayInteger() { @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_array_integer") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapArrayInteger(Map> mapArrayInteger) { this.mapArrayInteger = mapArrayInteger; } @@ -314,6 +344,9 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_array_anytype") + @JacksonXmlElementWrapper(useWrapping = false) public Map> getMapArrayAnytype() { return mapArrayAnytype; @@ -322,6 +355,9 @@ public Map> getMapArrayAnytype() { @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_array_anytype") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapArrayAnytype(Map> mapArrayAnytype) { this.mapArrayAnytype = mapArrayAnytype; } @@ -348,6 +384,9 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { return mapMapString; @@ -356,6 +395,9 @@ public Map> getMapMapString() { @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_map_string") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapString(Map> mapMapString) { this.mapMapString = mapMapString; } @@ -382,6 +424,9 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { return mapMapAnytype; @@ -390,6 +435,9 @@ public Map> getMapMapAnytype() { @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_map_anytype") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; } 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 340c4bc13fd4..7a793323daec 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 @@ -72,6 +72,9 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "ArrayArrayNumber") + @JacksonXmlElementWrapper(useWrapping = false) public List> getArrayArrayNumber() { return arrayArrayNumber; @@ -80,6 +83,9 @@ public List> getArrayArrayNumber() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "ArrayArrayNumber") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayNumber(List> arrayArrayNumber) { this.arrayArrayNumber = arrayArrayNumber; } 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 7cb2459021f8..3e5f9d7e3bb4 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 @@ -72,6 +72,9 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "ArrayNumber") + @JacksonXmlElementWrapper(useWrapping = false) public List getArrayNumber() { return arrayNumber; @@ -80,6 +83,9 @@ public List getArrayNumber() { @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "ArrayNumber") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayNumber(List arrayNumber) { this.arrayNumber = arrayNumber; } 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 efb117c1b077..1dd9a6771695 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 @@ -88,6 +88,9 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_of_string") + @JacksonXmlElementWrapper(useWrapping = false) public List getArrayOfString() { return arrayOfString; @@ -96,6 +99,9 @@ public List getArrayOfString() { @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_of_string") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayOfString(List arrayOfString) { this.arrayOfString = arrayOfString; } @@ -122,6 +128,9 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_array_of_integer") + @JacksonXmlElementWrapper(useWrapping = false) public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; @@ -130,6 +139,9 @@ public List> getArrayArrayOfInteger() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_array_of_integer") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { this.arrayArrayOfInteger = arrayArrayOfInteger; } @@ -156,6 +168,9 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_array_of_model") + @JacksonXmlElementWrapper(useWrapping = false) public List> getArrayArrayOfModel() { return arrayArrayOfModel; @@ -164,6 +179,9 @@ public List> getArrayArrayOfModel() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_array_of_model") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayOfModel(List> arrayArrayOfModel) { this.arrayArrayOfModel = arrayArrayOfModel; } 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 caa3a5fc0e9a..676de996bf1d 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 @@ -182,6 +182,9 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_enum") + @JacksonXmlElementWrapper(useWrapping = false) public List getArrayEnum() { return arrayEnum; @@ -190,6 +193,9 @@ public List getArrayEnum() { @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "array_enum") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayEnum(List arrayEnum) { this.arrayEnum = arrayEnum; } 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 eddb5c22f96a..e2726afde81c 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 @@ -105,6 +105,9 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "files") + @JacksonXmlElementWrapper(useWrapping = false) public List getFiles() { return files; @@ -113,6 +116,9 @@ public List getFiles() { @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "files") + @JacksonXmlElementWrapper(useWrapping = false) public void setFiles(List files) { this.files = files; } 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 796d8f5b289b..8805e89b63ba 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 @@ -134,6 +134,9 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_map_of_string") + @JacksonXmlElementWrapper(useWrapping = false) public Map> getMapMapOfString() { return mapMapOfString; @@ -142,6 +145,9 @@ public Map> getMapMapOfString() { @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_map_of_string") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapOfString(Map> mapMapOfString) { this.mapMapOfString = mapMapOfString; } @@ -168,6 +174,9 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_of_enum_string") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMapOfEnumString() { return mapOfEnumString; @@ -176,6 +185,9 @@ public Map getMapOfEnumString() { @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map_of_enum_string") + @JacksonXmlElementWrapper(useWrapping = false) public void setMapOfEnumString(Map mapOfEnumString) { this.mapOfEnumString = mapOfEnumString; } @@ -202,6 +214,9 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "direct_map") + @JacksonXmlElementWrapper(useWrapping = false) public Map getDirectMap() { return directMap; @@ -210,6 +225,9 @@ public Map getDirectMap() { @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "direct_map") + @JacksonXmlElementWrapper(useWrapping = false) public void setDirectMap(Map directMap) { this.directMap = directMap; } @@ -236,6 +254,9 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "indirect_map") + @JacksonXmlElementWrapper(useWrapping = false) public Map getIndirectMap() { return indirectMap; @@ -244,6 +265,9 @@ public Map getIndirectMap() { @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "indirect_map") + @JacksonXmlElementWrapper(useWrapping = false) public void setIndirectMap(Map indirectMap) { this.indirectMap = indirectMap; } 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 ac69d68d001f..bec2f3b50dd0 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 @@ -141,6 +141,9 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map") + @JacksonXmlElementWrapper(useWrapping = false) public Map getMap() { return map; @@ -149,6 +152,9 @@ public Map getMap() { @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "map") + @JacksonXmlElementWrapper(useWrapping = false) public void setMap(Map map) { this.map = map; } 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 5f56e0a02ae5..c32bf8dd954f 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 @@ -55,7 +55,7 @@ public class Pet { private Long id; public static final String JSON_PROPERTY_CATEGORY = "category"; - @XmlElement(name = "category") + @XmlElement(name = "Category") private Category category; public static final String JSON_PROPERTY_NAME = "name"; @@ -72,9 +72,9 @@ public class Pet { public static final String JSON_PROPERTY_TAGS = "tags"; // Is a container wrapped=true - // items.name=tags items.baseName=tags items.xmlName= items.xmlNamespace= + // items.name=tags items.baseName=tags items.xmlName=Tag items.xmlNamespace= // items.example= items.type=Tag - @XmlElement(name = "tags") + @XmlElement(name = "Tag") @XmlElementWrapper(name = "tag") private List tags; @@ -168,7 +168,7 @@ public Pet category(Category category) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_CATEGORY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - @JacksonXmlProperty(localName = "category") + @JacksonXmlProperty(localName = "Category") public Category getCategory() { return category; @@ -177,7 +177,7 @@ public Category getCategory() { @JsonProperty(JSON_PROPERTY_CATEGORY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - @JacksonXmlProperty(localName = "category") + @JacksonXmlProperty(localName = "Category") public void setCategory(Category category) { this.category = category; } @@ -232,8 +232,9 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls") + // xmlName=photoUrl + @JacksonXmlProperty(localName = "photoUrl") + @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl") public Set getPhotoUrls() { return photoUrls; @@ -243,8 +244,9 @@ public Set getPhotoUrls() { @JsonDeserialize(as = LinkedHashSet.class) @JsonProperty(JSON_PROPERTY_PHOTO_URLS) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrls") + // xmlName=photoUrl + @JacksonXmlProperty(localName = "photoUrl") + @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl") public void setPhotoUrls(Set photoUrls) { this.photoUrls = photoUrls; } @@ -271,8 +273,9 @@ public Pet addTagsItem(Tag tagsItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_TAGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "tags") + // xmlName=tag + @JacksonXmlProperty(localName = "tag") + @JacksonXmlElementWrapper(useWrapping = true, localName = "tag") public List getTags() { return tags; @@ -281,8 +284,9 @@ public List getTags() { @JsonProperty(JSON_PROPERTY_TAGS) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "tags") + // xmlName=tag + @JacksonXmlProperty(localName = "tag") + @JacksonXmlElementWrapper(useWrapping = true, localName = "tag") public void setTags(List tags) { this.tags = tags; } 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 1ba866610290..f49fdd8b22cb 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 @@ -204,6 +204,9 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) + // xmlName= + @JacksonXmlProperty(localName = "array_item") + @JacksonXmlElementWrapper(useWrapping = false) public List getArrayItem() { return arrayItem; @@ -212,6 +215,9 @@ public List getArrayItem() { @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) + // xmlName= + @JacksonXmlProperty(localName = "array_item") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayItem(List arrayItem) { this.arrayItem = arrayItem; } 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 a969eaf9e0d7..95cc7b489c2e 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 @@ -237,6 +237,9 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) + // xmlName= + @JacksonXmlProperty(localName = "array_item") + @JacksonXmlElementWrapper(useWrapping = false) public List getArrayItem() { return arrayItem; @@ -245,6 +248,9 @@ public List getArrayItem() { @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) + // xmlName= + @JacksonXmlProperty(localName = "array_item") + @JacksonXmlElementWrapper(useWrapping = false) public void setArrayItem(List arrayItem) { this.arrayItem = arrayItem; } 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 fa34d0b05b6c..d16408a49d16 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 @@ -353,8 +353,9 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "wrappedArray") + // xmlName= + @JacksonXmlProperty(localName = "wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "wrapped_array") public List getWrappedArray() { return wrappedArray; @@ -363,8 +364,9 @@ public List getWrappedArray() { @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "wrappedArray") + // xmlName= + @JacksonXmlProperty(localName = "wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "wrapped_array") public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; } @@ -503,6 +505,9 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "name_array") + @JacksonXmlElementWrapper(useWrapping = false) public List getNameArray() { return nameArray; @@ -511,6 +516,9 @@ public List getNameArray() { @JsonProperty(JSON_PROPERTY_NAME_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "name_array") + @JacksonXmlElementWrapper(useWrapping = false) public void setNameArray(List nameArray) { this.nameArray = nameArray; } @@ -537,8 +545,9 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { @javax.annotation.Nullable @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") + // xmlName=xml_name_wrapped_array + @JacksonXmlProperty(localName = "xml_name_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "xml_name_wrapped_array") public List getNameWrappedArray() { return nameWrappedArray; @@ -547,8 +556,9 @@ public List getNameWrappedArray() { @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") + // xmlName=xml_name_wrapped_array + @JacksonXmlProperty(localName = "xml_name_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "xml_name_wrapped_array") public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; } @@ -687,6 +697,9 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "prefix_array") + @JacksonXmlElementWrapper(useWrapping = false) public List getPrefixArray() { return prefixArray; @@ -695,6 +708,9 @@ public List getPrefixArray() { @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "prefix_array") + @JacksonXmlElementWrapper(useWrapping = false) public void setPrefixArray(List prefixArray) { this.prefixArray = prefixArray; } @@ -721,8 +737,9 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "prefixWrappedArray") + // xmlName= + @JacksonXmlProperty(localName = "prefix_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "prefix_wrapped_array") public List getPrefixWrappedArray() { return prefixWrappedArray; @@ -731,8 +748,9 @@ public List getPrefixWrappedArray() { @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, localName = "prefixWrappedArray") + // xmlName= + @JacksonXmlProperty(localName = "prefix_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, localName = "prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; } @@ -871,6 +889,9 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "namespace_array") + @JacksonXmlElementWrapper(useWrapping = false) public List getNamespaceArray() { return namespaceArray; @@ -879,6 +900,9 @@ public List getNamespaceArray() { @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "namespace_array") + @JacksonXmlElementWrapper(useWrapping = false) public void setNamespaceArray(List namespaceArray) { this.namespaceArray = namespaceArray; } @@ -905,8 +929,9 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespaceWrappedArray") + // xmlName= + @JacksonXmlProperty(namespace="http://f.com/schema", localName = "namespace_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespace_wrapped_array") public List getNamespaceWrappedArray() { return namespaceWrappedArray; @@ -915,8 +940,9 @@ public List getNamespaceWrappedArray() { @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // items.xmlName= - @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespaceWrappedArray") + // xmlName= + @JacksonXmlProperty(namespace="http://f.com/schema", localName = "namespace_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; } @@ -1055,6 +1081,9 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "prefix_ns_array") + @JacksonXmlElementWrapper(useWrapping = false) public List getPrefixNsArray() { return prefixNsArray; @@ -1063,6 +1092,9 @@ public List getPrefixNsArray() { @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + // xmlName= + @JacksonXmlProperty(localName = "prefix_ns_array") + @JacksonXmlElementWrapper(useWrapping = false) public void setPrefixNsArray(List prefixNsArray) { this.prefixNsArray = prefixNsArray; } @@ -1089,8 +1121,9 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { @javax.annotation.Nullable @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") + // xmlName= + @JacksonXmlProperty(namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") public List getPrefixNsWrappedArray() { return prefixNsWrappedArray; @@ -1099,8 +1132,9 @@ public List getPrefixNsWrappedArray() { @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") + // xmlName= + @JacksonXmlProperty(namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") + @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") public void setPrefixNsWrappedArray(List prefixNsWrappedArray) { this.prefixNsWrappedArray = prefixNsWrappedArray; } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java index 410419edbaab..8e321fd9bb0e 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java @@ -38,7 +38,7 @@ public class Pet { @JacksonXmlProperty(localName = "id") private Long id; - @JacksonXmlProperty(localName = "category") + @JacksonXmlProperty(localName = "Category") private Category category; @JacksonXmlProperty(localName = "name") From fa82fea52602e929f9597ed4899ccd61648b6dae Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Fri, 9 Jun 2023 01:04:40 +0200 Subject: [PATCH 3/3] suggestion: remove comment with empty name --- .../resources/Java/jackson_annotations.mustache | 4 +++- .../client/model/AdditionalPropertiesClass.java | 16 ---------------- .../client/model/ArrayOfArrayOfNumberOnly.java | 2 -- .../client/model/ArrayOfNumberOnly.java | 2 -- .../org/openapitools/client/model/ArrayTest.java | 6 ------ .../openapitools/client/model/EnumArrays.java | 2 -- .../client/model/FileSchemaTestClass.java | 2 -- .../org/openapitools/client/model/MapTest.java | 8 -------- ...edPropertiesAndAdditionalPropertiesClass.java | 2 -- .../client/model/TypeHolderDefault.java | 2 -- .../client/model/TypeHolderExample.java | 2 -- .../org/openapitools/client/model/XmlItem.java | 16 ---------------- 12 files changed, 3 insertions(+), 61 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache index 77cb62afd404..c7413447479a 100644 --- a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache +++ b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache @@ -11,7 +11,9 @@ @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}") {{/isContainer}} {{#isContainer}} - // xmlName={{xmlName}} + {{#xmlName}} + // xmlName={{.}} + {{/xmlName}} @JacksonXmlProperty({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/xmlName}}") @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}{{#xmlNamespace}}, namespace="{{.}}"{{/xmlNamespace}}{{#isXmlWrapped}}, localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{/isXmlWrapped}}) {{/isContainer}} 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 dd9292478324..43a2a35b5a49 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 @@ -144,7 +144,6 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_string") @JacksonXmlElementWrapper(useWrapping = false) @@ -155,7 +154,6 @@ public Map getMapString() { @JsonProperty(JSON_PROPERTY_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_string") @JacksonXmlElementWrapper(useWrapping = false) public void setMapString(Map mapString) { @@ -184,7 +182,6 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_number") @JacksonXmlElementWrapper(useWrapping = false) @@ -195,7 +192,6 @@ public Map getMapNumber() { @JsonProperty(JSON_PROPERTY_MAP_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_number") @JacksonXmlElementWrapper(useWrapping = false) public void setMapNumber(Map mapNumber) { @@ -224,7 +220,6 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_integer") @JacksonXmlElementWrapper(useWrapping = false) @@ -235,7 +230,6 @@ public Map getMapInteger() { @JsonProperty(JSON_PROPERTY_MAP_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_integer") @JacksonXmlElementWrapper(useWrapping = false) public void setMapInteger(Map mapInteger) { @@ -264,7 +258,6 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_boolean") @JacksonXmlElementWrapper(useWrapping = false) @@ -275,7 +268,6 @@ public Map getMapBoolean() { @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_boolean") @JacksonXmlElementWrapper(useWrapping = false) public void setMapBoolean(Map mapBoolean) { @@ -304,7 +296,6 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List> getMapArrayInteger() { @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_array_integer") @JacksonXmlElementWrapper(useWrapping = false) public void setMapArrayInteger(Map> mapArrayInteger) { @@ -344,7 +334,6 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_array_anytype") @JacksonXmlElementWrapper(useWrapping = false) @@ -355,7 +344,6 @@ public Map> getMapArrayAnytype() { @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_array_anytype") @JacksonXmlElementWrapper(useWrapping = false) public void setMapArrayAnytype(Map> mapArrayAnytype) { @@ -384,7 +372,6 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map> getMapMapString() { @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_map_string") @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapString(Map> mapMapString) { @@ -424,7 +410,6 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map> getMapMapAnytype() { @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_map_anytype") @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapAnytype(Map> mapMapAnytype) { 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 7a793323daec..16dd0e53ce64 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 @@ -72,7 +72,6 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayAr @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "ArrayArrayNumber") @JacksonXmlElementWrapper(useWrapping = false) @@ -83,7 +82,6 @@ public List> getArrayArrayNumber() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "ArrayArrayNumber") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayNumber(List> arrayArrayNumber) { 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 3e5f9d7e3bb4..8bff063526c2 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 @@ -72,7 +72,6 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "ArrayNumber") @JacksonXmlElementWrapper(useWrapping = false) @@ -83,7 +82,6 @@ public List getArrayNumber() { @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "ArrayNumber") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayNumber(List arrayNumber) { 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 1dd9a6771695..c1469fd53192 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 @@ -88,7 +88,6 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_of_string") @JacksonXmlElementWrapper(useWrapping = false) @@ -99,7 +98,6 @@ public List getArrayOfString() { @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_of_string") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayOfString(List arrayOfString) { @@ -128,7 +126,6 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_array_of_integer") @JacksonXmlElementWrapper(useWrapping = false) @@ -139,7 +136,6 @@ public List> getArrayArrayOfInteger() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_array_of_integer") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayOfInteger(List> arrayArrayOfInteger) { @@ -168,7 +164,6 @@ public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelI @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_array_of_model") @JacksonXmlElementWrapper(useWrapping = false) @@ -179,7 +174,6 @@ public List> getArrayArrayOfModel() { @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_array_of_model") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayArrayOfModel(List> arrayArrayOfModel) { 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 676de996bf1d..5a170895fadb 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 @@ -182,7 +182,6 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_enum") @JacksonXmlElementWrapper(useWrapping = false) @@ -193,7 +192,6 @@ public List getArrayEnum() { @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "array_enum") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayEnum(List arrayEnum) { 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 e2726afde81c..c39ea1fea2bd 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 @@ -105,7 +105,6 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "files") @JacksonXmlElementWrapper(useWrapping = false) @@ -116,7 +115,6 @@ public List getFiles() { @JsonProperty(JSON_PROPERTY_FILES) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "files") @JacksonXmlElementWrapper(useWrapping = false) public void setFiles(List files) { 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 8805e89b63ba..c4dd2c682796 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 @@ -134,7 +134,6 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_map_of_string") @JacksonXmlElementWrapper(useWrapping = false) @@ -145,7 +144,6 @@ public Map> getMapMapOfString() { @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_map_of_string") @JacksonXmlElementWrapper(useWrapping = false) public void setMapMapOfString(Map> mapMapOfString) { @@ -174,7 +172,6 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_of_enum_string") @JacksonXmlElementWrapper(useWrapping = false) @@ -185,7 +182,6 @@ public Map getMapOfEnumString() { @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map_of_enum_string") @JacksonXmlElementWrapper(useWrapping = false) public void setMapOfEnumString(Map mapOfEnumString) { @@ -214,7 +210,6 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "direct_map") @JacksonXmlElementWrapper(useWrapping = false) @@ -225,7 +220,6 @@ public Map getDirectMap() { @JsonProperty(JSON_PROPERTY_DIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "direct_map") @JacksonXmlElementWrapper(useWrapping = false) public void setDirectMap(Map directMap) { @@ -254,7 +248,6 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "indirect_map") @JacksonXmlElementWrapper(useWrapping = false) @@ -265,7 +258,6 @@ public Map getIndirectMap() { @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "indirect_map") @JacksonXmlElementWrapper(useWrapping = false) public void setIndirectMap(Map indirectMap) { 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 bec2f3b50dd0..a655282974cc 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 @@ -141,7 +141,6 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map") @JacksonXmlElementWrapper(useWrapping = false) @@ -152,7 +151,6 @@ public Map getMap() { @JsonProperty(JSON_PROPERTY_MAP) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "map") @JacksonXmlElementWrapper(useWrapping = false) public void setMap(Map map) { 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 f49fdd8b22cb..08ddad661ad1 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 @@ -204,7 +204,6 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) { @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // xmlName= @JacksonXmlProperty(localName = "array_item") @JacksonXmlElementWrapper(useWrapping = false) @@ -215,7 +214,6 @@ public List getArrayItem() { @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // xmlName= @JacksonXmlProperty(localName = "array_item") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayItem(List arrayItem) { 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 95cc7b489c2e..ec83ac67b418 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 @@ -237,7 +237,6 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) { @javax.annotation.Nonnull @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // xmlName= @JacksonXmlProperty(localName = "array_item") @JacksonXmlElementWrapper(useWrapping = false) @@ -248,7 +247,6 @@ public List getArrayItem() { @JsonProperty(JSON_PROPERTY_ARRAY_ITEM) @JsonInclude(value = JsonInclude.Include.ALWAYS) - // xmlName= @JacksonXmlProperty(localName = "array_item") @JacksonXmlElementWrapper(useWrapping = false) public void setArrayItem(List arrayItem) { 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 d16408a49d16..3b03c8d653d6 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 @@ -353,7 +353,6 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, localName = "wrapped_array") @@ -364,7 +363,6 @@ public List getWrappedArray() { @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, localName = "wrapped_array") public void setWrappedArray(List wrappedArray) { @@ -505,7 +503,6 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAME_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "name_array") @JacksonXmlElementWrapper(useWrapping = false) @@ -516,7 +513,6 @@ public List getNameArray() { @JsonProperty(JSON_PROPERTY_NAME_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "name_array") @JacksonXmlElementWrapper(useWrapping = false) public void setNameArray(List nameArray) { @@ -697,7 +693,6 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_array") @JacksonXmlElementWrapper(useWrapping = false) @@ -708,7 +703,6 @@ public List getPrefixArray() { @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_array") @JacksonXmlElementWrapper(useWrapping = false) public void setPrefixArray(List prefixArray) { @@ -737,7 +731,6 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, localName = "prefix_wrapped_array") @@ -748,7 +741,6 @@ public List getPrefixWrappedArray() { @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, localName = "prefix_wrapped_array") public void setPrefixWrappedArray(List prefixWrappedArray) { @@ -889,7 +881,6 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "namespace_array") @JacksonXmlElementWrapper(useWrapping = false) @@ -900,7 +891,6 @@ public List getNamespaceArray() { @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "namespace_array") @JacksonXmlElementWrapper(useWrapping = false) public void setNamespaceArray(List namespaceArray) { @@ -929,7 +919,6 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(namespace="http://f.com/schema", localName = "namespace_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespace_wrapped_array") @@ -940,7 +929,6 @@ public List getNamespaceWrappedArray() { @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(namespace="http://f.com/schema", localName = "namespace_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "namespace_wrapped_array") public void setNamespaceWrappedArray(List namespaceWrappedArray) { @@ -1081,7 +1069,6 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_ns_array") @JacksonXmlElementWrapper(useWrapping = false) @@ -1092,7 +1079,6 @@ public List getPrefixNsArray() { @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(localName = "prefix_ns_array") @JacksonXmlElementWrapper(useWrapping = false) public void setPrefixNsArray(List prefixNsArray) { @@ -1121,7 +1107,6 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { @javax.annotation.Nullable @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") @@ -1132,7 +1117,6 @@ public List getPrefixNsWrappedArray() { @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - // xmlName= @JacksonXmlProperty(namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") @JacksonXmlElementWrapper(useWrapping = true, namespace="http://f.com/schema", localName = "prefix_ns_wrapped_array") public void setPrefixNsWrappedArray(List prefixNsWrappedArray) {