loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[java] fix optional array property's default value (#14961)

Browse Source 
* fix optional array property default value

* fix default values

* more fixes

* update default value for jersey2, 3, okhttp-gson

* update default value

* fix java okhttp-gson

* fix jersey2, 3
This commit is contained in:
William Cheng
2023-03-17 11:58:49 +08:00
committed by GitHub
parent d0f7bd18ba
commit 3d4f7b3ce0
622 changed files with 3440 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ public class ArrayOfArrayOfNumberOnly {
// items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
// items.example= items.type=List<BigDecimal>
@XmlElement(name = "arrayArrayNumber")
private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<>();
private List<List<BigDecimal>> arrayArrayNumber;
public ArrayOfArrayOfNumberOnly() {
}

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

@@ -46,7 +46,7 @@ public class ArrayOfNumberOnly {
// items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace=
// items.example= items.type=BigDecimal
@XmlElement(name = "arrayNumber")
private List<BigDecimal> arrayNumber = new ArrayList<>();
private List<BigDecimal> arrayNumber;
public ArrayOfNumberOnly() {
}

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

@@ -48,21 +48,21 @@ public class ArrayTest {
// items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "arrayOfString")
private List<String> arrayOfString = new ArrayList<>();
private List<String> arrayOfString;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
// Is a container wrapped=false
// items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;Long&gt;
@XmlElement(name = "arrayArrayOfInteger")
private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
private List<List<Long>> arrayArrayOfInteger;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
// Is a container wrapped=false
// items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;ReadOnlyFirst&gt;
@XmlElement(name = "arrayArrayOfModel")
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel;
public ArrayTest() {
}

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

@@ -128,7 +128,7 @@ public class EnumArrays {
// items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "arrayEnum")
private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
private List<ArrayEnumEnum> arrayEnum;
public EnumArrays() {
}

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

@@ -51,7 +51,7 @@ public class FileSchemaTestClass {
// items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
// items.example= items.type=ModelFile
@XmlElement(name = "files")
private List<ModelFile> files = new ArrayList<>();
private List<ModelFile> files;
public FileSchemaTestClass() {
}

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

@@ -76,7 +76,7 @@ public class Pet {
// items.example= items.type=Tag
@XmlElement(name = "tags")
@XmlElementWrapper(name = "tag")
private List<Tag> tags = new ArrayList<>();
private List<Tag> tags;
/**
* pet status in the store
@@ -218,6 +218,9 @@ public class Pet {
}
public Pet addPhotoUrlsItem(String photoUrlsItem) {
if (this.photoUrls == null) {
this.photoUrls = new LinkedHashSet<>();
}
this.photoUrls.add(photoUrlsItem);
return this;
}

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

@@ -190,6 +190,9 @@ public class TypeHolderDefault {
}
public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
if (this.arrayItem == null) {
this.arrayItem = new ArrayList<>();
}
this.arrayItem.add(arrayItemItem);
return this;
}

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

@@ -223,6 +223,9 @@ public class TypeHolderExample {
}
public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
if (this.arrayItem == null) {
this.arrayItem = new ArrayList<>();
}
this.arrayItem.add(arrayItemItem);
return this;
}

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

@@ -91,7 +91,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "wrappedArray")
@XmlElementWrapper(name = "wrapped_array")
private List<Integer> wrappedArray = new ArrayList<>();
private List<Integer> wrappedArray;
public static final String JSON_PROPERTY_NAME_STRING = "name_string";
@XmlElement(name = "xml_name_string")
@@ -114,7 +114,7 @@ public class XmlItem {
// 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")
private List<Integer> nameArray = new ArrayList<>();
private List<Integer> nameArray;
public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
// Is a container wrapped=true
@@ -122,7 +122,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "xml_name_wrapped_array_item")
@XmlElementWrapper(name = "xml_name_wrapped_array")
private List<Integer> nameWrappedArray = new ArrayList<>();
private List<Integer> nameWrappedArray;
public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
@XmlElement(name = "prefix_string")
@@ -145,7 +145,7 @@ public class XmlItem {
// items.name=prefixArray items.baseName=prefixArray items.xmlName= items.xmlNamespace=
// items.example= items.type=Integer
@XmlElement(name = "prefixArray")
private List<Integer> prefixArray = new ArrayList<>();
private List<Integer> prefixArray;
public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
// Is a container wrapped=true
@@ -153,7 +153,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "prefixWrappedArray")
@XmlElementWrapper(name = "prefix_wrapped_array")
private List<Integer> prefixWrappedArray = new ArrayList<>();
private List<Integer> prefixWrappedArray;
public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
@XmlElement(namespace="http://a.com/schema", name = "namespace_string")
@@ -176,7 +176,7 @@ public class XmlItem {
// 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")
private List<Integer> namespaceArray = new ArrayList<>();
private List<Integer> namespaceArray;
public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
// Is a container wrapped=true
@@ -184,7 +184,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(namespace="http://g.com/schema", name = "namespaceWrappedArray")
@XmlElementWrapper(namespace="http://f.com/schema", name = "namespace_wrapped_array")
private List<Integer> namespaceWrappedArray = new ArrayList<>();
private List<Integer> namespaceWrappedArray;
public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
@XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string")
@@ -207,7 +207,7 @@ public class XmlItem {
// 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")
private List<Integer> prefixNsArray = new ArrayList<>();
private List<Integer> prefixNsArray;
public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
// Is a container wrapped=true
@@ -215,7 +215,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(namespace="http://g.com/schema", name = "prefixNsWrappedArray")
@XmlElementWrapper(namespace="http://f.com/schema", name = "prefix_ns_wrapped_array")
private List<Integer> prefixNsWrappedArray = new ArrayList<>();
private List<Integer> prefixNsWrappedArray;
public XmlItem() {
}