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

[java-client] set collection to null when not required (#3615)

Browse Source 
* [java][model] set collection to null when not required

* Fix tests

* Fix trailing whitespace

* generate samples

* Restore 'de.thetaphi' plugin in pom.xml
This commit is contained in:
Jérémie Bresson
2019-08-15 16:01:19 +02:00
committed by William Cheng
parent 2ada4d90b4
commit a4811c7850
234 changed files with 700 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "inner")
private Map<String, String> mapString = new HashMap<String, String>();
private Map<String, String> mapString = null;
public static final String JSON_PROPERTY_MAP_NUMBER = "map_number";
@JsonProperty(JSON_PROPERTY_MAP_NUMBER)
@@ -49,7 +49,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=BigDecimal
@XmlElement(name = "inner")
private Map<String, BigDecimal> mapNumber = new HashMap<String, BigDecimal>();
private Map<String, BigDecimal> mapNumber = null;
public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer";
@JsonProperty(JSON_PROPERTY_MAP_INTEGER)
@@ -57,7 +57,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Integer
@XmlElement(name = "inner")
private Map<String, Integer> mapInteger = new HashMap<String, Integer>();
private Map<String, Integer> mapInteger = null;
public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean";
@JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
@@ -65,7 +65,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Boolean
@XmlElement(name = "inner")
private Map<String, Boolean> mapBoolean = new HashMap<String, Boolean>();
private Map<String, Boolean> mapBoolean = null;
public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer";
@JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
@@ -73,7 +73,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;Integer&gt;
@XmlElement(name = "inner")
private Map<String, List<Integer>> mapArrayInteger = new HashMap<String, List<Integer>>();
private Map<String, List<Integer>> mapArrayInteger = null;
public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype";
@JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
@@ -81,7 +81,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;Object&gt;
@XmlElement(name = "inner")
private Map<String, List<Object>> mapArrayAnytype = new HashMap<String, List<Object>>();
private Map<String, List<Object>> mapArrayAnytype = null;
public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string";
@JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
@@ -89,7 +89,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Map&lt;String, String&gt;
@XmlElement(name = "inner")
private Map<String, Map<String, String>> mapMapString = new HashMap<String, Map<String, String>>();
private Map<String, Map<String, String>> mapMapString = null;
public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype";
@JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
@@ -97,7 +97,7 @@ public class AdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Map&lt;String, Object&gt;
@XmlElement(name = "inner")
private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<String, Map<String, Object>>();
private Map<String, Map<String, Object>> mapMapAnytype = null;
public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
@JsonProperty(JSON_PROPERTY_ANYTYPE1)

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

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

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

@@ -40,7 +40,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<BigDecimal>();
private List<BigDecimal> arrayNumber = null;
public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
this.arrayNumber = arrayNumber;

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

@@ -40,7 +40,7 @@ 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<String>();
private List<String> arrayOfString = null;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
@JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
@@ -48,7 +48,7 @@ public class ArrayTest {
// 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<List<Long>>();
private List<List<Long>> arrayArrayOfInteger = null;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
@JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
@@ -56,7 +56,7 @@ public class ArrayTest {
// 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<List<ReadOnlyFirst>>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
public ArrayTest arrayOfString(List<String> arrayOfString) {
this.arrayOfString = arrayOfString;

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

@@ -115,7 +115,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<ArrayEnumEnum>();
private List<ArrayEnumEnum> arrayEnum = null;
public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
this.justSymbol = justSymbol;

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

@@ -45,7 +45,7 @@ public class FileSchemaTestClass {
// items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
// items.example= items.type=java.io.File
@XmlElement(name = "files")
private List<java.io.File> files = new ArrayList<java.io.File>();
private List<java.io.File> files = null;
public FileSchemaTestClass file(java.io.File file) {
this.file = file;

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

@@ -40,7 +40,7 @@ public class MapTest {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Map&lt;String, String&gt;
@XmlElement(name = "inner")
private Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
private Map<String, Map<String, String>> mapMapOfString = null;
/**
* Gets or Sets inner
@@ -83,7 +83,7 @@ public class MapTest {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "inner")
private Map<String, InnerEnum> mapOfEnumString = new HashMap<String, InnerEnum>();
private Map<String, InnerEnum> mapOfEnumString = null;
public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
@JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -91,7 +91,7 @@ public class MapTest {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Boolean
@XmlElement(name = "inner")
private Map<String, Boolean> directMap = new HashMap<String, Boolean>();
private Map<String, Boolean> directMap = null;
public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
@JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
@@ -99,7 +99,7 @@ public class MapTest {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Boolean
@XmlElement(name = "inner")
private Map<String, Boolean> indirectMap = new HashMap<String, Boolean>();
private Map<String, Boolean> indirectMap = null;
public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
this.mapMapOfString = mapMapOfString;

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

@@ -55,7 +55,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
// items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
// items.example= items.type=Animal
@XmlElement(name = "inner")
private Map<String, Animal> map = new HashMap<String, Animal>();
private Map<String, Animal> map = null;
public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
this.uuid = uuid;

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

@@ -73,7 +73,7 @@ public class Pet {
// items.example= items.type=Tag
@XmlElement(name = "tags")
@XmlElementWrapper(name = "tag")
private List<Tag> tags = new ArrayList<Tag>();
private List<Tag> tags = null;
/**
* pet status in the store

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

@@ -67,7 +67,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "wrappedArray")
@XmlElementWrapper(name = "wrapped_array")
private List<Integer> wrappedArray = new ArrayList<Integer>();
private List<Integer> wrappedArray = null;
public static final String JSON_PROPERTY_NAME_STRING = "name_string";
@JsonProperty(JSON_PROPERTY_NAME_STRING)
@@ -99,7 +99,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<Integer>();
private List<Integer> nameArray = null;
public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
@JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
@@ -110,7 +110,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<Integer>();
private List<Integer> nameWrappedArray = null;
public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
@JsonProperty(JSON_PROPERTY_PREFIX_STRING)
@@ -142,7 +142,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<Integer>();
private List<Integer> prefixArray = null;
public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
@JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
@@ -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<Integer>();
private List<Integer> prefixWrappedArray = null;
public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
@JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
@@ -185,7 +185,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<Integer>();
private List<Integer> namespaceArray = null;
public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
@JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
@@ -196,7 +196,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<Integer>();
private List<Integer> namespaceWrappedArray = null;
public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
@JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
@@ -228,7 +228,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<Integer>();
private List<Integer> prefixNsArray = null;
public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
@JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
@@ -239,7 +239,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<Integer>();
private List<Integer> prefixNsWrappedArray = null;
public XmlItem attributeString(String attributeString) {
this.attributeString = attributeString;