Pass optional as null (#7066)

* Pass optional as null * Addressing review comments * Addressing review comments-2 * Addressing review comments-3
2017-12-04 19:48:32 +05:30
parent 61e706ba6f
commit a4fbbb5999
31 changed files with 77 additions and 46 deletions
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -37,8 +37,13 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
   * {{{description}}}  
  **/
 {{/description}}
-  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/vars}}
-
+{{#isContainer}}
+  private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};
+{{/isContainer}}
+{{^isContainer}}
+  private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
+{{/isContainer}}
+  {{/vars}}
  {{#vars}}
 /**
  {{#description}}
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java
@@ -18,10 +18,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class AdditionalPropertiesClass  {
  
  @ApiModelProperty(value = "")
-  private Map<String, String> mapProperty = new HashMap<String, String>();
-  @ApiModelProperty(value = "")
-  private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<String, Map<String, String>>();
+  private Map<String, String> mapProperty = null;

+  @ApiModelProperty(value = "")
+  private Map<String, Map<String, String>> mapOfMapProperty = null;
 /**
   * Get mapProperty
   * @return mapProperty
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java
@@ -18,9 +18,9 @@ public class Animal  {
  
  @ApiModelProperty(required = true, value = "")
  private String className = null;
+
  @ApiModelProperty(value = "")
  private String color = "red";
-
 /**
   * Get className
   * @return className
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java
@@ -17,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;

 public class AnimalFarm extends ArrayList<Animal> {
  
-
-
  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java
@@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class ArrayOfArrayOfNumberOnly  {
  
  @ApiModelProperty(value = "")
-  private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
-
+  private List<List<BigDecimal>> arrayArrayNumber = null;
 /**
   * Get arrayArrayNumber
   * @return arrayArrayNumber
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java
@@ -18,8 +18,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class ArrayOfNumberOnly  {
  
  @ApiModelProperty(value = "")
-  private List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
-
+  private List<BigDecimal> arrayNumber = null;
 /**
   * Get arrayNumber
   * @return arrayNumber
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java
@@ -18,12 +18,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class ArrayTest  {
  
  @ApiModelProperty(value = "")
-  private List<String> arrayOfString = new ArrayList<String>();
-  @ApiModelProperty(value = "")
-  private List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
-  @ApiModelProperty(value = "")
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
+  private List<String> arrayOfString = null;

+  @ApiModelProperty(value = "")
+  private List<List<Long>> arrayArrayOfInteger = null;
+
+  @ApiModelProperty(value = "")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 /**
   * Get arrayOfString
   * @return arrayOfString
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java
@@ -16,20 +16,24 @@ public class Capitalization  {
  
  @ApiModelProperty(value = "")
  private String smallCamel = null;
+
  @ApiModelProperty(value = "")
  private String capitalCamel = null;
+
  @ApiModelProperty(value = "")
  private String smallSnake = null;
+
  @ApiModelProperty(value = "")
  private String capitalSnake = null;
+
  @ApiModelProperty(value = "")
  private String scAETHFlowPoints = null;
+
  @ApiModelProperty(value = "Name of the pet ")
 /**
   * Name of the pet   
  **/
  private String ATT_NAME = null;
-
 /**
   * Get smallCamel
   * @return smallCamel
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java
@@ -17,7 +17,6 @@ public class Cat extends Animal {
  
  @ApiModelProperty(value = "")
  private Boolean declawed = null;
-
 /**
   * Get declawed
   * @return declawed
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Category.java
@@ -16,9 +16,9 @@ public class Category  {
  
  @ApiModelProperty(value = "")
  private Long id = null;
+
  @ApiModelProperty(value = "")
  private String name = null;
-
 /**
   * Get id
   * @return id
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java
@@ -21,7 +21,6 @@ public class ClassModel  {
  
  @ApiModelProperty(value = "")
  private String propertyClass = null;
-
 /**
   * Get propertyClass
   * @return propertyClass
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java
@@ -16,7 +16,6 @@ public class Client  {
  
  @ApiModelProperty(value = "")
  private String client = null;
-
 /**
   * Get client
   * @return client
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java
@@ -17,7 +17,6 @@ public class Dog extends Animal {
  
  @ApiModelProperty(value = "")
  private String breed = null;
-
 /**
   * Get breed
   * @return breed
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java
@@ -52,6 +52,7 @@ public enum JustSymbolEnum {
  @ApiModelProperty(value = "")
  private JustSymbolEnum justSymbol = null;

+
@XmlType(name="ArrayEnumEnum")
@XmlEnum(String.class)
 public enum ArrayEnumEnum {
@@ -85,8 +86,7 @@ public enum ArrayEnumEnum {
 }

  @ApiModelProperty(value = "")
-  private List<ArrayEnumEnum> arrayEnum = new ArrayList<ArrayEnumEnum>();
-
+  private List<ArrayEnumEnum> arrayEnum = null;
 /**
   * Get justSymbol
   * @return justSymbol
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java
@@ -51,6 +51,7 @@ public enum EnumStringEnum {
  @ApiModelProperty(value = "")
  private EnumStringEnum enumString = null;

+
@XmlType(name="EnumIntegerEnum")
@XmlEnum(Integer.class)
 public enum EnumIntegerEnum {
@@ -86,6 +87,7 @@ public enum EnumIntegerEnum {
  @ApiModelProperty(value = "")
  private EnumIntegerEnum enumInteger = null;

+
@XmlType(name="EnumNumberEnum")
@XmlEnum(Double.class)
 public enum EnumNumberEnum {
@@ -120,9 +122,9 @@ public enum EnumNumberEnum {

  @ApiModelProperty(value = "")
  private EnumNumberEnum enumNumber = null;
+
  @ApiModelProperty(value = "")
  private OuterEnum outerEnum = null;
-
 /**
   * Get enumString
   * @return enumString
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java
@@ -20,31 +20,42 @@ public class FormatTest  {
  
  @ApiModelProperty(value = "")
  private Integer integer = null;
+
  @ApiModelProperty(value = "")
  private Integer int32 = null;
+
  @ApiModelProperty(value = "")
  private Long int64 = null;
+
  @ApiModelProperty(required = true, value = "")
  private BigDecimal number = null;
+
  @ApiModelProperty(value = "")
  private Float _float = null;
+
  @ApiModelProperty(value = "")
  private Double _double = null;
+
  @ApiModelProperty(value = "")
  private String string = null;
+
  @ApiModelProperty(required = true, value = "")
  private byte[] _byte = null;
+
  @ApiModelProperty(value = "")
  private byte[] binary = null;
+
  @ApiModelProperty(required = true, value = "")
  private LocalDate date = null;
+
  @ApiModelProperty(value = "")
  private Date dateTime = null;
+
  @ApiModelProperty(value = "")
  private UUID uuid = null;
+
  @ApiModelProperty(required = true, value = "")
  private String password = null;
-
 /**
   * Get integer
   * minimum: 10
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java
@@ -16,9 +16,9 @@ public class HasOnlyReadOnly  {
  
  @ApiModelProperty(value = "")
  private String bar = null;
+
  @ApiModelProperty(value = "")
  private String foo = null;
-
 /**
   * Get bar
   * @return bar
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java
@@ -18,7 +18,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class MapTest  {
  
  @ApiModelProperty(value = "")
-  private Map<String, Map<String, String>> mapMapOfString = new HashMap<String, Map<String, String>>();
+  private Map<String, Map<String, String>> mapMapOfString = null;
+

@XmlType(name="InnerEnum")
@XmlEnum(String.class)
@@ -53,8 +54,7 @@ public enum InnerEnum {
 }

  @ApiModelProperty(value = "")
-  private Map<String, InnerEnum> mapOfEnumString = new HashMap<String, InnerEnum>();
-
+  private Map<String, InnerEnum> mapOfEnumString = null;
 /**
   * Get mapMapOfString
   * @return mapMapOfString
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -22,11 +22,12 @@ public class MixedPropertiesAndAdditionalPropertiesClass  {
  
  @ApiModelProperty(value = "")
  private UUID uuid = null;
+
  @ApiModelProperty(value = "")
  private Date dateTime = null;
-  @ApiModelProperty(value = "")
-  private Map<String, Animal> map = new HashMap<String, Animal>();

+  @ApiModelProperty(value = "")
+  private Map<String, Animal> map = null;
 /**
   * Get uuid
   * @return uuid
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Model200Response.java
@@ -21,9 +21,9 @@ public class Model200Response  {
  
  @ApiModelProperty(value = "")
  private Integer name = null;
+
  @ApiModelProperty(value = "")
  private String propertyClass = null;
-
 /**
   * Get name
   * @return name
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelApiResponse.java
@@ -16,11 +16,12 @@ public class ModelApiResponse  {
  
  @ApiModelProperty(value = "")
  private Integer code = null;
+
  @ApiModelProperty(value = "")
  private String type = null;
+
  @ApiModelProperty(value = "")
  private String message = null;
-
 /**
   * Get code
   * @return code
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java
@@ -21,7 +21,6 @@ public class ModelReturn  {
  
  @ApiModelProperty(value = "")
  private Integer _return = null;
-
 /**
   * Get _return
   * @return _return
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java
@@ -21,13 +21,15 @@ public class Name  {
  
  @ApiModelProperty(required = true, value = "")
  private Integer name = null;
+
  @ApiModelProperty(value = "")
  private Integer snakeCase = null;
+
  @ApiModelProperty(value = "")
  private String property = null;
+
  @ApiModelProperty(value = "")
  private Integer _123Number = null;
-
 /**
   * Get name
   * @return name
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java
@@ -17,7 +17,6 @@ public class NumberOnly  {
  
  @ApiModelProperty(value = "")
  private BigDecimal justNumber = null;
-
 /**
   * Get justNumber
   * @return justNumber
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java
@@ -17,13 +17,17 @@ public class Order  {
  
  @ApiModelProperty(value = "")
  private Long id = null;
+
  @ApiModelProperty(value = "")
  private Long petId = null;
+
  @ApiModelProperty(value = "")
  private Integer quantity = null;
+
  @ApiModelProperty(value = "")
  private Date shipDate = null;

+
@XmlType(name="StatusEnum")
@XmlEnum(String.class)
 public enum StatusEnum {
@@ -61,9 +65,9 @@ public enum StatusEnum {
   * Order Status  
  **/
  private StatusEnum status = null;
+
  @ApiModelProperty(value = "")
  private Boolean complete = false;
-
 /**
   * Get id
   * @return id
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/OuterComposite.java
@@ -17,11 +17,12 @@ public class OuterComposite  {
  
  @ApiModelProperty(value = "")
  private BigDecimal myNumber = null;
+
  @ApiModelProperty(value = "")
  private String myString = null;
+
  @ApiModelProperty(value = "")
  private Boolean myBoolean = null;
-
 /**
   * Get myNumber
   * @return myNumber
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java
@@ -20,14 +20,19 @@ public class Pet  {
  
  @ApiModelProperty(value = "")
  private Long id = null;
+
  @ApiModelProperty(value = "")
  private Category category = null;
+
  @ApiModelProperty(example = "doggie", required = true, value = "")
  private String name = null;
+
  @ApiModelProperty(required = true, value = "")
  private List<String> photoUrls = new ArrayList<String>();
+
  @ApiModelProperty(value = "")
-  private List<Tag> tags = new ArrayList<Tag>();
+  private List<Tag> tags = null;
+

@XmlType(name="StatusEnum")
@XmlEnum(String.class)
@@ -66,7 +71,6 @@ public enum StatusEnum {
   * pet status in the store  
  **/
  private StatusEnum status = null;
-
 /**
   * Get id
   * @return id
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java
@@ -16,9 +16,9 @@ public class ReadOnlyFirst  {
  
  @ApiModelProperty(value = "")
  private String bar = null;
+
  @ApiModelProperty(value = "")
  private String baz = null;
-
 /**
   * Get bar
   * @return bar
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/SpecialModelName.java
@@ -16,7 +16,6 @@ public class SpecialModelName  {
  
  @ApiModelProperty(value = "")
  private Long specialPropertyName = null;
-
 /**
   * Get specialPropertyName
   * @return specialPropertyName
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java
@@ -16,9 +16,9 @@ public class Tag  {
  
  @ApiModelProperty(value = "")
  private Long id = null;
+
  @ApiModelProperty(value = "")
  private String name = null;
-
 /**
   * Get id
   * @return id
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java
@@ -16,24 +16,30 @@ public class User  {
  
  @ApiModelProperty(value = "")
  private Long id = null;
+
  @ApiModelProperty(value = "")
  private String username = null;
+
  @ApiModelProperty(value = "")
  private String firstName = null;
+
  @ApiModelProperty(value = "")
  private String lastName = null;
+
  @ApiModelProperty(value = "")
  private String email = null;
+
  @ApiModelProperty(value = "")
  private String password = null;
+
  @ApiModelProperty(value = "")
  private String phone = null;
+
  @ApiModelProperty(value = "User Status")
 /**
   * User Status  
  **/
  private Integer userStatus = null;
-
 /**
   * Get id
   * @return id