From a4fbbb5999bca24829f4a0978014829b45dbd2de Mon Sep 17 00:00:00 2001 From: Sridhar-1987 Date: Mon, 4 Dec 2017 19:48:32 +0530 Subject: [PATCH] Pass optional as null (#7066) * Pass optional as null * Addressing review comments * Addressing review comments-2 * Addressing review comments-3 --- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 9 +++++++-- .../io/swagger/model/AdditionalPropertiesClass.java | 6 +++--- .../src/gen/java/io/swagger/model/Animal.java | 2 +- .../src/gen/java/io/swagger/model/AnimalFarm.java | 2 -- .../io/swagger/model/ArrayOfArrayOfNumberOnly.java | 3 +-- .../java/io/swagger/model/ArrayOfNumberOnly.java | 3 +-- .../src/gen/java/io/swagger/model/ArrayTest.java | 11 ++++++----- .../gen/java/io/swagger/model/Capitalization.java | 6 +++++- .../src/gen/java/io/swagger/model/Cat.java | 1 - .../src/gen/java/io/swagger/model/Category.java | 2 +- .../src/gen/java/io/swagger/model/ClassModel.java | 1 - .../src/gen/java/io/swagger/model/Client.java | 1 - .../src/gen/java/io/swagger/model/Dog.java | 1 - .../src/gen/java/io/swagger/model/EnumArrays.java | 4 ++-- .../src/gen/java/io/swagger/model/EnumTest.java | 4 +++- .../src/gen/java/io/swagger/model/FormatTest.java | 13 ++++++++++++- .../gen/java/io/swagger/model/HasOnlyReadOnly.java | 2 +- .../src/gen/java/io/swagger/model/MapTest.java | 6 +++--- ...MixedPropertiesAndAdditionalPropertiesClass.java | 5 +++-- .../gen/java/io/swagger/model/Model200Response.java | 2 +- .../gen/java/io/swagger/model/ModelApiResponse.java | 3 ++- .../src/gen/java/io/swagger/model/ModelReturn.java | 1 - .../src/gen/java/io/swagger/model/Name.java | 4 +++- .../src/gen/java/io/swagger/model/NumberOnly.java | 1 - .../src/gen/java/io/swagger/model/Order.java | 6 +++++- .../gen/java/io/swagger/model/OuterComposite.java | 3 ++- .../src/gen/java/io/swagger/model/Pet.java | 8 ++++++-- .../gen/java/io/swagger/model/ReadOnlyFirst.java | 2 +- .../gen/java/io/swagger/model/SpecialModelName.java | 1 - .../src/gen/java/io/swagger/model/Tag.java | 2 +- .../src/gen/java/io/swagger/model/User.java | 8 +++++++- 31 files changed, 77 insertions(+), 46 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache index e59e0b9064a9..f1bcb38e57d0 100644 --- 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}} diff --git 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 index 0fd4f04aeeac..353bc6e2cbc5 100644 --- 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 mapProperty = new HashMap(); - @ApiModelProperty(value = "") - private Map> mapOfMapProperty = new HashMap>(); + private Map mapProperty = null; + @ApiModelProperty(value = "") + private Map> mapOfMapProperty = null; /** * Get mapProperty * @return mapProperty diff --git 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 index 29ad41d9e985..2962c676df84 100644 --- 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 diff --git 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 index e3ea311206f1..f124292c31d4 100644 --- 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 { - - @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git 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 index da2ba2eba345..de5d9f8863cb 100644 --- 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> arrayArrayNumber = new ArrayList>(); - + private List> arrayArrayNumber = null; /** * Get arrayArrayNumber * @return arrayArrayNumber diff --git 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 index 30ad053c2147..d9e2795aa972 100644 --- 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 arrayNumber = new ArrayList(); - + private List arrayNumber = null; /** * Get arrayNumber * @return arrayNumber diff --git 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 index c76d50e816ff..fa3e7f481abe 100644 --- 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 arrayOfString = new ArrayList(); - @ApiModelProperty(value = "") - private List> arrayArrayOfInteger = new ArrayList>(); - @ApiModelProperty(value = "") - private List> arrayArrayOfModel = new ArrayList>(); + private List arrayOfString = null; + @ApiModelProperty(value = "") + private List> arrayArrayOfInteger = null; + + @ApiModelProperty(value = "") + private List> arrayArrayOfModel = null; /** * Get arrayOfString * @return arrayOfString diff --git 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 index 89278c7c2983..7333898c61f2 100644 --- 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 diff --git 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 index 64f6869a3f8c..f5af4d9c7337 100644 --- 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 diff --git 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 index d16c0c2d3d44..2be982a410b5 100644 --- 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 diff --git 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 index fcdc0f570542..e3af436a21c9 100644 --- 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 diff --git 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 index ee4bb6ffcf0a..4d6bd4d03634 100644 --- 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 diff --git 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 index 3cdf1f4adcb0..aca8d694c72b 100644 --- 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 diff --git 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 index 68193c7ada4f..ecf3512c1d28 100644 --- 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 arrayEnum = new ArrayList(); - + private List arrayEnum = null; /** * Get justSymbol * @return justSymbol diff --git 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 index e4db3ed4395a..93e832b37b95 100644 --- 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 diff --git 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 index 1e90851cede5..c9085fc2e6f1 100644 --- 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 diff --git 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 index 079686f4d3f7..e9ab9aadf50c 100644 --- 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 diff --git 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 index cf29fcfb87dd..fa39d05a2881 100644 --- 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> mapMapOfString = new HashMap>(); + private Map> mapMapOfString = null; + @XmlType(name="InnerEnum") @XmlEnum(String.class) @@ -53,8 +54,7 @@ public enum InnerEnum { } @ApiModelProperty(value = "") - private Map mapOfEnumString = new HashMap(); - + private Map mapOfEnumString = null; /** * Get mapMapOfString * @return mapMapOfString diff --git 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 index fa87343a7e60..c86319b2fcad 100644 --- 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 map = new HashMap(); + @ApiModelProperty(value = "") + private Map map = null; /** * Get uuid * @return uuid diff --git 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 index 4a5621e30be4..30e12af1b470 100644 --- 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 diff --git 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 index 1b313aaa3a00..64f77fc254ec 100644 --- 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 diff --git 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 index 0c514b23b5c2..3d11f555a120 100644 --- 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 diff --git 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 index 8743ac35dbb0..2c7e77096ed6 100644 --- 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 diff --git 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 index b6755c7a9a2f..8d6e7d662ae3 100644 --- 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 diff --git 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 index 4b5fbdf96406..4e4a7a75b65f 100644 --- 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 diff --git 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 index 82c7d8fa9d9f..33fd0d7c28a0 100644 --- 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 diff --git 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 index 8cb32bc3e9c0..a91ce9b1713f 100644 --- 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 photoUrls = new ArrayList(); + @ApiModelProperty(value = "") - private List tags = new ArrayList(); + private List 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 diff --git 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 index d6c2527bc13d..144819040de9 100644 --- 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 diff --git 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 index af734ec937d1..ab33c276f21e 100644 --- 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 diff --git 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 index 77d43ac52eb5..a6497e31663a 100644 --- 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 diff --git 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 index 44509b594beb..62643de8aa2d 100644 --- 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