[Java] Add null pointer check to add/put methods

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

@@ -44,13 +44,23 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }

modules/swagger-codegen/src/main/resources/JavaJaxRS/pojo.mustache

@@ -40,13 +40,23 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }

modules/swagger-codegen/src/main/resources/JavaPlayFramework/pojo.mustache

@@ -38,13 +38,23 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }

modules/swagger-codegen/src/main/resources/JavaSpring/pojo.mustache

@@ -43,13 +43,23 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }

modules/swagger-codegen/src/main/resources/MSF4J/pojo.mustache

@@ -40,13 +40,23 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
   {{#isListContainer}}
 
   public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.add({{name}}Item);
     return this;
   }
   {{/isListContainer}}
   {{#isMapContainer}}
 
   public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
+    {{^required}}
+    if (this.{{name}} == null) {
+      this.{{name}} = {{{defaultValue}}};
+    }
+    {{/required}}
     this.{{name}}.put(key, {{name}}Item);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -39,6 +39,9 @@ public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
   }
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
+    if (this.mapProperty == null) {
+      this.mapProperty = new HashMap<String, String>();
+    }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
   }
@@ -62,6 +65,9 @@ public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String
   }
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
+    if (this.mapOfMapProperty == null) {
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
+    }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
   }
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
   }
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
     this.arrayNumber.add(arrayNumberItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -42,6 +42,9 @@ public ArrayTest arrayOfString(List<String> arrayOfString) {
   }
 
   public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<String>();
+    }
     this.arrayOfString.add(arrayOfStringItem);
     return this;
   }
@@ -65,6 +68,9 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
   }
 
   public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
+    }
     this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
     return this;
   }
@@ -88,6 +94,9 @@ public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)
   }
 
   public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+    }
     this.arrayArrayOfModel.add(arrayArrayOfModelItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -116,6 +116,9 @@ public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
   }
 
   public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
+    }
     this.arrayEnum.add(arrayEnumItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java

@@ -69,6 +69,9 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
   }
 
   public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
+    }
     this.mapMapOfString.put(key, mapMapOfStringItem);
     return this;
   }
@@ -92,6 +95,9 @@ public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
   }
 
   public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
+    }
     this.mapOfEnumString.put(key, mapOfEnumStringItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -81,6 +81,9 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<String, Animal>();
+    }
     this.map.put(key, mapItem);
     return this;
   }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java

@@ -161,6 +161,9 @@ public Pet tags(List<Tag> tags) {
   }
 
   public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
     this.tags.add(tagsItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -39,6 +39,9 @@ public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
   }
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
+    if (this.mapProperty == null) {
+      this.mapProperty = new HashMap<String, String>();
+    }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
   }
@@ -62,6 +65,9 @@ public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String
   }
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
+    if (this.mapOfMapProperty == null) {
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
+    }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
   }
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
   }
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
     this.arrayNumber.add(arrayNumberItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -42,6 +42,9 @@ public ArrayTest arrayOfString(List<String> arrayOfString) {
   }
 
   public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<String>();
+    }
     this.arrayOfString.add(arrayOfStringItem);
     return this;
   }
@@ -65,6 +68,9 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
   }
 
   public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
+    }
     this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
     return this;
   }
@@ -88,6 +94,9 @@ public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)
   }
 
   public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+    }
     this.arrayArrayOfModel.add(arrayArrayOfModelItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -116,6 +116,9 @@ public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
   }
 
   public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
+    }
     this.arrayEnum.add(arrayEnumItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java

@@ -69,6 +69,9 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
   }
 
   public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
+    }
     this.mapMapOfString.put(key, mapMapOfStringItem);
     return this;
   }
@@ -92,6 +95,9 @@ public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
   }
 
   public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
+    }
     this.mapOfEnumString.put(key, mapOfEnumStringItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -81,6 +81,9 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<String, Animal>();
+    }
     this.map.put(key, mapItem);
     return this;
   }

samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java

@@ -161,6 +161,9 @@ public Pet tags(List<Tag> tags) {
   }
 
   public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<Tag>();
+    }
     this.tags.add(tagsItem);
     return this;
   }

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -39,6 +39,9 @@ public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
   }
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
+    if (this.mapProperty == null) {
+      this.mapProperty = new HashMap<String, String>();
+    }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
   }
@@ -62,6 +65,9 @@ public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String
   }
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
+    if (this.mapOfMapProperty == null) {
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
+    }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;
   }

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
   }
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
+    }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;
   }

samples/client/petstore/java/jersey2-java6/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -36,6 +36,9 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
   }
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<BigDecimal>();
+    }
     this.arrayNumber.add(arrayNumberItem);
     return this;
   }