From 127c675e61db5edcb6200f2a501f919d161d122d Mon Sep 17 00:00:00 2001 From: Sridhar Kumar Date: Tue, 28 Nov 2017 08:08:57 +0530 Subject: [PATCH 1/4] Pass optional as null --- bin/jaxrs-cxf-petstore-server.sh | 4 +-- .../resources/JavaJaxRS/cxf/pojo.mustache | 4 ++- .../model/AdditionalPropertiesClass.java | 7 ++++-- .../src/gen/java/io/swagger/model/Animal.java | 3 +++ .../gen/java/io/swagger/model/AnimalFarm.java | 1 - .../model/ArrayOfArrayOfNumberOnly.java | 3 ++- .../io/swagger/model/ArrayOfNumberOnly.java | 3 ++- .../gen/java/io/swagger/model/ArrayTest.java | 11 +++++--- .../java/io/swagger/model/Capitalization.java | 11 ++++++++ .../src/gen/java/io/swagger/model/Cat.java | 1 + .../gen/java/io/swagger/model/Category.java | 3 +++ .../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 + .../gen/java/io/swagger/model/EnumArrays.java | 5 +++- .../gen/java/io/swagger/model/EnumTest.java | 7 ++++++ .../gen/java/io/swagger/model/FormatTest.java | 25 +++++++++++++++++++ .../io/swagger/model/HasOnlyReadOnly.java | 3 +++ .../gen/java/io/swagger/model/MapTest.java | 7 ++++-- ...ropertiesAndAdditionalPropertiesClass.java | 7 +++++- .../io/swagger/model/Model200Response.java | 3 +++ .../io/swagger/model/ModelApiResponse.java | 5 ++++ .../java/io/swagger/model/ModelReturn.java | 1 + .../src/gen/java/io/swagger/model/Name.java | 7 ++++++ .../gen/java/io/swagger/model/NumberOnly.java | 1 + .../src/gen/java/io/swagger/model/Order.java | 11 ++++++++ .../java/io/swagger/model/OuterComposite.java | 5 ++++ .../src/gen/java/io/swagger/model/Pet.java | 13 +++++++++- .../java/io/swagger/model/ReadOnlyFirst.java | 3 +++ .../io/swagger/model/SpecialModelName.java | 1 + .../src/gen/java/io/swagger/model/Tag.java | 3 +++ .../src/gen/java/io/swagger/model/User.java | 15 +++++++++++ 32 files changed, 160 insertions(+), 16 deletions(-) diff --git a/bin/jaxrs-cxf-petstore-server.sh b/bin/jaxrs-cxf-petstore-server.sh index 4c69eac4452..6b24047de66 100755 --- a/bin/jaxrs-cxf-petstore-server.sh +++ b/bin/jaxrs-cxf-petstore-server.sh @@ -17,7 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then APP_DIR=`cd "${APP_DIR}"; pwd` fi -executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" +executable="../modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" if [ ! -f "$executable" ] then @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf -DhideGenerationTimestamp=true" +ags="$@ generate -t ../modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i ../modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o ../samples/server/petstore/jaxrs-cxf -DhideGenerationTimestamp=true" java $JAVA_OPTS -jar $executable $ags 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 e59e0b9064a..a3938fb3348 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -37,7 +37,9 @@ 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}} /** 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 0fd4f04aeea..053b55469a6 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,9 +18,12 @@ public class AdditionalPropertiesClass { @ApiModelProperty(value = "") - private Map mapProperty = new HashMap(); + private Map mapProperty = null; + + @ApiModelProperty(value = "") - private Map> mapOfMapProperty = new HashMap>(); + private Map> mapOfMapProperty = null; + /** * Get 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 29ad41d9e98..1de8a4701f1 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 @@ -17,8 +17,11 @@ public class Animal { @ApiModelProperty(required = true, value = "") + private String className = null; + @ApiModelProperty(value = "") + private String color = "red"; /** 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 e3ea311206f..4af8bfd566f 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 @@ -18,7 +18,6 @@ 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 da2ba2eba34..8daa3c1e4c1 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,7 +18,8 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") - private List> arrayArrayNumber = new ArrayList>(); + private List> arrayArrayNumber = null; + /** * Get 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 30ad053c214..381835b6c29 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,7 +18,8 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") - private List arrayNumber = new ArrayList(); + private List arrayNumber = null; + /** * Get 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 c76d50e816f..a4220216d9b 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,11 +18,16 @@ public class ArrayTest { @ApiModelProperty(value = "") - private List arrayOfString = new ArrayList(); + private List arrayOfString = null; + + @ApiModelProperty(value = "") - private List> arrayArrayOfInteger = new ArrayList>(); + private List> arrayArrayOfInteger = null; + + @ApiModelProperty(value = "") - private List> arrayArrayOfModel = new ArrayList>(); + private List> arrayArrayOfModel = null; + /** * Get 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 89278c7c298..843b71a5cb9 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 @@ -15,19 +15,30 @@ 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; /** 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 64f6869a3f8..8de35b53499 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 @@ -16,6 +16,7 @@ public class Cat extends Animal { @ApiModelProperty(value = "") + private Boolean declawed = null; /** 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 d16c0c2d3d4..201603bc83b 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 @@ -15,8 +15,11 @@ public class Category { @ApiModelProperty(value = "") + private Long id = null; + @ApiModelProperty(value = "") + private String name = null; /** 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 fcdc0f57054..789a23b7db4 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 @@ -20,6 +20,7 @@ public class ClassModel { @ApiModelProperty(value = "") + private String propertyClass = null; /** 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 ee4bb6ffcf0..f2d9845c381 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 @@ -15,6 +15,7 @@ public class Client { @ApiModelProperty(value = "") + private String client = null; /** 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 3cdf1f4adcb..9a7ec5862d1 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 @@ -16,6 +16,7 @@ public class Dog extends Animal { @ApiModelProperty(value = "") + private String breed = null; /** 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 68193c7ada4..b3ca36c2717 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 @@ -50,8 +50,10 @@ public static JustSymbolEnum fromValue(String v) { } @ApiModelProperty(value = "") + private JustSymbolEnum justSymbol = null; + @XmlType(name="ArrayEnumEnum") @XmlEnum(String.class) public enum ArrayEnumEnum { @@ -85,7 +87,8 @@ public static ArrayEnumEnum fromValue(String v) { } @ApiModelProperty(value = "") - private List arrayEnum = new ArrayList(); + private List arrayEnum = null; + /** * Get 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 e4db3ed4395..904c0f53104 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 @@ -49,8 +49,10 @@ public static EnumStringEnum fromValue(String v) { } @ApiModelProperty(value = "") + private EnumStringEnum enumString = null; + @XmlType(name="EnumIntegerEnum") @XmlEnum(Integer.class) public enum EnumIntegerEnum { @@ -84,8 +86,10 @@ public static EnumIntegerEnum fromValue(String v) { } @ApiModelProperty(value = "") + private EnumIntegerEnum enumInteger = null; + @XmlType(name="EnumNumberEnum") @XmlEnum(Double.class) public enum EnumNumberEnum { @@ -119,8 +123,11 @@ public static EnumNumberEnum fromValue(String v) { } @ApiModelProperty(value = "") + private EnumNumberEnum enumNumber = null; + @ApiModelProperty(value = "") + private OuterEnum outerEnum = null; /** 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 1e90851cede..d0aa7db532b 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 @@ -19,30 +19,55 @@ 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; /** 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 079686f4d3f..3ebbb37d148 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 @@ -15,8 +15,11 @@ public class HasOnlyReadOnly { @ApiModelProperty(value = "") + private String bar = null; + @ApiModelProperty(value = "") + private String foo = null; /** 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 cf29fcfb87d..f5894a81a0e 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,9 @@ public class MapTest { @ApiModelProperty(value = "") - private Map> mapMapOfString = new HashMap>(); + private Map> mapMapOfString = null; + + @XmlType(name="InnerEnum") @XmlEnum(String.class) @@ -53,7 +55,8 @@ public static InnerEnum fromValue(String v) { } @ApiModelProperty(value = "") - private Map mapOfEnumString = new HashMap(); + private Map mapOfEnumString = null; + /** * Get 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 fa87343a7e6..8f4f4098c29 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 @@ -21,11 +21,16 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") + private UUID uuid = null; + @ApiModelProperty(value = "") + private Date dateTime = null; + @ApiModelProperty(value = "") - private Map map = new HashMap(); + private Map map = null; + /** * Get 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 4a5621e30be..287cab62774 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 @@ -20,8 +20,11 @@ public class Model200Response { @ApiModelProperty(value = "") + private Integer name = null; + @ApiModelProperty(value = "") + private String propertyClass = null; /** 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 1b313aaa3a0..dd92f60965f 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 @@ -15,10 +15,15 @@ public class ModelApiResponse { @ApiModelProperty(value = "") + private Integer code = null; + @ApiModelProperty(value = "") + private String type = null; + @ApiModelProperty(value = "") + private String message = null; /** 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 0c514b23b5c..e7811d3323e 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 @@ -20,6 +20,7 @@ public class ModelReturn { @ApiModelProperty(value = "") + private Integer _return = null; /** 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 8743ac35dbb..9dd9b3ec660 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 @@ -20,12 +20,19 @@ 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; /** 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 b6755c7a9a2..a26e001aa8a 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 @@ -16,6 +16,7 @@ public class NumberOnly { @ApiModelProperty(value = "") + private BigDecimal justNumber = null; /** 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 4b5fbdf9640..f9bf9451378 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 @@ -16,14 +16,22 @@ 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 { @@ -60,8 +68,11 @@ public static StatusEnum fromValue(String v) { /** * Order Status **/ + private StatusEnum status = null; + @ApiModelProperty(value = "") + private Boolean complete = false; /** 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 82c7d8fa9d9..564c7afc4da 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 @@ -16,10 +16,15 @@ public class OuterComposite { @ApiModelProperty(value = "") + private BigDecimal myNumber = null; + @ApiModelProperty(value = "") + private String myString = null; + @ApiModelProperty(value = "") + private Boolean myBoolean = null; /** 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 8cb32bc3e9c..38290be526e 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 @@ -19,15 +19,25 @@ 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) @@ -65,6 +75,7 @@ public static StatusEnum fromValue(String v) { /** * pet status in the store **/ + private StatusEnum status = null; /** 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 d6c2527bc13..25f3396b2ec 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 @@ -15,8 +15,11 @@ public class ReadOnlyFirst { @ApiModelProperty(value = "") + private String bar = null; + @ApiModelProperty(value = "") + private String baz = null; /** 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 af734ec937d..ac099687b1b 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 @@ -15,6 +15,7 @@ public class SpecialModelName { @ApiModelProperty(value = "") + private Long specialPropertyName = null; /** 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 77d43ac52eb..5861e1eb771 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 @@ -15,8 +15,11 @@ public class Tag { @ApiModelProperty(value = "") + private Long id = null; + @ApiModelProperty(value = "") + private String name = null; /** 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 44509b594be..18e693e98ed 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 @@ -15,23 +15,38 @@ 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; /** From 5e47ecae219a63a7d3a230699aebac731607c1be Mon Sep 17 00:00:00 2001 From: Sridhar Kumar Date: Tue, 28 Nov 2017 21:18:16 +0530 Subject: [PATCH 2/4] Addressing review comments --- bin/jaxrs-cxf-petstore-server.sh | 4 ++-- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 8 ++++++-- .../io/swagger/model/AdditionalPropertiesClass.java | 2 -- .../src/gen/java/io/swagger/model/Animal.java | 2 -- .../io/swagger/model/ArrayOfArrayOfNumberOnly.java | 1 - .../java/io/swagger/model/ArrayOfNumberOnly.java | 1 - .../src/gen/java/io/swagger/model/ArrayTest.java | 3 --- .../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 | 2 -- .../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 | 2 -- ...MixedPropertiesAndAdditionalPropertiesClass.java | 3 --- .../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 | 6 ------ .../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, 8 insertions(+), 90 deletions(-) diff --git a/bin/jaxrs-cxf-petstore-server.sh b/bin/jaxrs-cxf-petstore-server.sh index 6b24047de66..4c69eac4452 100755 --- a/bin/jaxrs-cxf-petstore-server.sh +++ b/bin/jaxrs-cxf-petstore-server.sh @@ -17,7 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then APP_DIR=`cd "${APP_DIR}"; pwd` fi -executable="../modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" +executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" if [ ! -f "$executable" ] then @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t ../modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i ../modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o ../samples/server/petstore/jaxrs-cxf -DhideGenerationTimestamp=true" +ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o samples/server/petstore/jaxrs-cxf -DhideGenerationTimestamp=true" java $JAVA_OPTS -jar $executable $ags 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 a3938fb3348..52ee22bd080 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,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { * {{{description}}} **/ {{/description}} - {{#isContainer}}private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}};{{/isContainer}} - {{^isContainer}}private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};{{/isContainer}} + {{#isContainer}} + private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; + {{/isContainer}} + {{^isContainer}} + private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}}; + {{/isContainer}} {{/vars}} {{#vars}} 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 053b55469a6..d2fe855eb28 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 @@ -19,11 +19,9 @@ public class AdditionalPropertiesClass { @ApiModelProperty(value = "") private Map mapProperty = null; - @ApiModelProperty(value = "") private Map> mapOfMapProperty = null; - /** * Get 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 1de8a4701f1..b099b9c11b5 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 @@ -17,11 +17,9 @@ public class Animal { @ApiModelProperty(required = true, value = "") - private String className = null; @ApiModelProperty(value = "") - private String color = "red"; /** 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 8daa3c1e4c1..e62418113df 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 @@ -19,7 +19,6 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") private List> arrayArrayNumber = null; - /** * Get 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 381835b6c29..cfed53ea0e6 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 @@ -19,7 +19,6 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") private List arrayNumber = null; - /** * Get 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 a4220216d9b..c5350466e87 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 @@ -19,15 +19,12 @@ public class ArrayTest { @ApiModelProperty(value = "") private List arrayOfString = null; - @ApiModelProperty(value = "") private List> arrayArrayOfInteger = null; - @ApiModelProperty(value = "") private List> arrayArrayOfModel = null; - /** * Get 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 843b71a5cb9..2bafea70a79 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 @@ -15,30 +15,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; /** 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 8de35b53499..64f6869a3f8 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 @@ -16,7 +16,6 @@ public class Cat extends Animal { @ApiModelProperty(value = "") - private Boolean declawed = null; /** 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 201603bc83b..c4e5fdaedfe 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 @@ -15,11 +15,9 @@ public class Category { @ApiModelProperty(value = "") - private Long id = null; @ApiModelProperty(value = "") - private String name = null; /** 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 789a23b7db4..fcdc0f57054 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 @@ -20,7 +20,6 @@ public class ClassModel { @ApiModelProperty(value = "") - private String propertyClass = null; /** 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 f2d9845c381..ee4bb6ffcf0 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 @@ -15,7 +15,6 @@ public class Client { @ApiModelProperty(value = "") - private String client = null; /** 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 9a7ec5862d1..3cdf1f4adcb 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 @@ -16,7 +16,6 @@ public class Dog extends Animal { @ApiModelProperty(value = "") - private String breed = null; /** 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 b3ca36c2717..bc30034234a 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 @@ -50,7 +50,6 @@ public static JustSymbolEnum fromValue(String v) { } @ApiModelProperty(value = "") - private JustSymbolEnum justSymbol = null; @@ -88,7 +87,6 @@ public static ArrayEnumEnum fromValue(String v) { @ApiModelProperty(value = "") private List arrayEnum = null; - /** * Get 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 904c0f53104..63a511bd8a0 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 @@ -49,7 +49,6 @@ public static EnumStringEnum fromValue(String v) { } @ApiModelProperty(value = "") - private EnumStringEnum enumString = null; @@ -86,7 +85,6 @@ public static EnumIntegerEnum fromValue(String v) { } @ApiModelProperty(value = "") - private EnumIntegerEnum enumInteger = null; @@ -123,11 +121,9 @@ public static EnumNumberEnum fromValue(String v) { } @ApiModelProperty(value = "") - private EnumNumberEnum enumNumber = null; @ApiModelProperty(value = "") - private OuterEnum outerEnum = null; /** 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 d0aa7db532b..0a02a761342 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 @@ -19,55 +19,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; /** 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 3ebbb37d148..66c35663310 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 @@ -15,11 +15,9 @@ public class HasOnlyReadOnly { @ApiModelProperty(value = "") - private String bar = null; @ApiModelProperty(value = "") - private String foo = null; /** 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 f5894a81a0e..ef6c659c3d6 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 @@ -19,7 +19,6 @@ public class MapTest { @ApiModelProperty(value = "") private Map> mapMapOfString = null; - @XmlType(name="InnerEnum") @@ -56,7 +55,6 @@ public static InnerEnum fromValue(String v) { @ApiModelProperty(value = "") private Map mapOfEnumString = null; - /** * Get 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 8f4f4098c29..5875045920f 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 @@ -21,16 +21,13 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @ApiModelProperty(value = "") - private UUID uuid = null; @ApiModelProperty(value = "") - private Date dateTime = null; @ApiModelProperty(value = "") private Map map = null; - /** * Get 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 287cab62774..b15a022e76a 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 @@ -20,11 +20,9 @@ public class Model200Response { @ApiModelProperty(value = "") - private Integer name = null; @ApiModelProperty(value = "") - private String propertyClass = null; /** 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 dd92f60965f..b341b416b0e 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 @@ -15,15 +15,12 @@ public class ModelApiResponse { @ApiModelProperty(value = "") - private Integer code = null; @ApiModelProperty(value = "") - private String type = null; @ApiModelProperty(value = "") - private String message = null; /** 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 e7811d3323e..0c514b23b5c 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 @@ -20,7 +20,6 @@ public class ModelReturn { @ApiModelProperty(value = "") - private Integer _return = null; /** 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 9dd9b3ec660..10ab56e447b 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 @@ -20,19 +20,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; /** 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 a26e001aa8a..b6755c7a9a2 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 @@ -16,7 +16,6 @@ public class NumberOnly { @ApiModelProperty(value = "") - private BigDecimal justNumber = null; /** 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 f9bf9451378..4a86567a9b7 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 @@ -16,19 +16,15 @@ 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; @@ -68,11 +64,9 @@ public static StatusEnum fromValue(String v) { /** * Order Status **/ - private StatusEnum status = null; @ApiModelProperty(value = "") - private Boolean complete = false; /** 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 564c7afc4da..16c4ab052ef 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 @@ -16,15 +16,12 @@ public class OuterComposite { @ApiModelProperty(value = "") - private BigDecimal myNumber = null; @ApiModelProperty(value = "") - private String myString = null; @ApiModelProperty(value = "") - private Boolean myBoolean = null; /** 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 38290be526e..5c513ffb2e4 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 @@ -19,24 +19,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 = null; - @XmlType(name="StatusEnum") @@ -75,7 +70,6 @@ public static StatusEnum fromValue(String v) { /** * pet status in the store **/ - private StatusEnum status = null; /** 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 25f3396b2ec..1528b242795 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 @@ -15,11 +15,9 @@ public class ReadOnlyFirst { @ApiModelProperty(value = "") - private String bar = null; @ApiModelProperty(value = "") - private String baz = null; /** 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 ac099687b1b..af734ec937d 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 @@ -15,7 +15,6 @@ public class SpecialModelName { @ApiModelProperty(value = "") - private Long specialPropertyName = null; /** 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 5861e1eb771..50358c8a894 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 @@ -15,11 +15,9 @@ public class Tag { @ApiModelProperty(value = "") - private Long id = null; @ApiModelProperty(value = "") - private String name = null; /** 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 18e693e98ed..2ed5ee897d1 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 @@ -15,38 +15,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; /** From fdab64b250db9b16cf3016f08d22027cc70611f7 Mon Sep 17 00:00:00 2001 From: Sridhar Kumar Date: Tue, 28 Nov 2017 21:22:21 +0530 Subject: [PATCH 3/4] Addressing review comments-2 --- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 1 - .../src/gen/java/io/swagger/model/AdditionalPropertiesClass.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Animal.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/AnimalFarm.java | 1 - .../src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java | 1 - .../src/gen/java/io/swagger/model/ArrayOfNumberOnly.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/ArrayTest.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/Capitalization.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Cat.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/Category.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/ClassModel.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Client.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Dog.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/EnumArrays.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/FormatTest.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/HasOnlyReadOnly.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java | 1 - .../model/MixedPropertiesAndAdditionalPropertiesClass.java | 1 - .../src/gen/java/io/swagger/model/Model200Response.java | 1 - .../src/gen/java/io/swagger/model/ModelApiResponse.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/ModelReturn.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Name.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/NumberOnly.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Order.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/OuterComposite.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Pet.java | 1 - .../jaxrs-cxf/src/gen/java/io/swagger/model/ReadOnlyFirst.java | 1 - .../src/gen/java/io/swagger/model/SpecialModelName.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/Tag.java | 1 - .../petstore/jaxrs-cxf/src/gen/java/io/swagger/model/User.java | 1 - 31 files changed, 31 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 52ee22bd080..8218d422250 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -44,7 +44,6 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { 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 d2fe855eb28..353bc6e2cbc 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 @@ -22,7 +22,6 @@ public class AdditionalPropertiesClass { @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 b099b9c11b5..2962c676df8 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 @@ -21,7 +21,6 @@ public class Animal { @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 4af8bfd566f..f124292c31d 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,7 +17,6 @@ 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 e62418113df..de5d9f8863c 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 @@ -19,7 +19,6 @@ public class ArrayOfArrayOfNumberOnly { @ApiModelProperty(value = "") 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 cfed53ea0e6..d9e2795aa97 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 @@ -19,7 +19,6 @@ public class ArrayOfNumberOnly { @ApiModelProperty(value = "") 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 c5350466e87..fa3e7f481ab 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 @@ -25,7 +25,6 @@ public class ArrayTest { @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 2bafea70a79..7333898c61f 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 @@ -34,7 +34,6 @@ public class Capitalization { * 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 64f6869a3f8..f5af4d9c733 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 c4e5fdaedfe..2be982a410b 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 @@ -19,7 +19,6 @@ public class Category { @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 fcdc0f57054..e3af436a21c 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 ee4bb6ffcf0..4d6bd4d0363 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 3cdf1f4adcb..aca8d694c72 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 bc30034234a..ecf3512c1d2 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 @@ -87,7 +87,6 @@ public static ArrayEnumEnum fromValue(String v) { @ApiModelProperty(value = "") 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 63a511bd8a0..93e832b37b9 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 @@ -125,7 +125,6 @@ public static EnumNumberEnum fromValue(String v) { @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 0a02a761342..c9085fc2e6f 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 @@ -56,7 +56,6 @@ public class FormatTest { @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 66c35663310..e9ab9aadf50 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 @@ -19,7 +19,6 @@ public class HasOnlyReadOnly { @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 ef6c659c3d6..fa39d05a288 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 @@ -55,7 +55,6 @@ public static InnerEnum fromValue(String v) { @ApiModelProperty(value = "") 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 5875045920f..c86319b2fca 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 @@ -28,7 +28,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @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 b15a022e76a..30e12af1b47 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 @@ -24,7 +24,6 @@ public class Model200Response { @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 b341b416b0e..64f77fc254e 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 @@ -22,7 +22,6 @@ public class ModelApiResponse { @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 0c514b23b5c..3d11f555a12 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 10ab56e447b..2c7e77096ed 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 @@ -30,7 +30,6 @@ public class Name { @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 b6755c7a9a2..8d6e7d662ae 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 4a86567a9b7..4e4a7a75b65 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 @@ -68,7 +68,6 @@ public static StatusEnum fromValue(String v) { @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 16c4ab052ef..33fd0d7c28a 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 @@ -23,7 +23,6 @@ public class OuterComposite { @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 5c513ffb2e4..a91ce9b1713 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 @@ -71,7 +71,6 @@ public static StatusEnum fromValue(String v) { * 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 1528b242795..144819040de 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 @@ -19,7 +19,6 @@ public class ReadOnlyFirst { @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 af734ec937d..ab33c276f21 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 50358c8a894..a6497e31663 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 @@ -19,7 +19,6 @@ public class Tag { @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 2ed5ee897d1..62643de8aa2 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 @@ -40,7 +40,6 @@ public class User { * User Status **/ private Integer userStatus = null; - /** * Get id * @return id From 48322ca76faab14f514e5d2de50dfcccd03f3eb6 Mon Sep 17 00:00:00 2001 From: Sridhar Kumar Date: Tue, 28 Nov 2017 21:42:00 +0530 Subject: [PATCH 4/4] Addressing review comments-3 --- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 8218d422250..f1bcb38e57d 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -37,12 +37,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { * {{{description}}} **/ {{/description}} - {{#isContainer}} +{{#isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#required}} = {{{defaultValue}}}{{/required}}{{^required}} = null{{/required}}; - {{/isContainer}} - {{^isContainer}} +{{/isContainer}} +{{^isContainer}} private {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}}; - {{/isContainer}} +{{/isContainer}} {{/vars}} {{#vars}} /**