From 48acbdc6f7c339e8a2426db1667057d65a5c3df1 Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Sun, 15 Oct 2017 20:10:32 -0500 Subject: [PATCH 1/8] Included Open Systems International in the list of companies using Swagger Codegen --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 11d88e418cc..9961dd9a4ac 100644 --- a/README.md +++ b/README.md @@ -799,6 +799,7 @@ Here are some companies/projects using Swagger Codegen in production. To add you - [nViso](http://www.nviso.ch/) - [Okiok](https://www.okiok.com) - [Onedata](http://onedata.org) +- [Open International Systems](https://openintl.com/) - [OrderCloud.io](http://ordercloud.io) - [OSDN](https://osdn.jp) - [PagerDuty](https://www.pagerduty.com) From d9eb9c71076e1cf185ff15ee48088e3960d45ed4 Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Sun, 15 Oct 2017 21:01:40 -0500 Subject: [PATCH 2/8] Force Jackson to use the real names of the properties of the Data type defined in the YAML --- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 2 ++ 1 file changed, 2 insertions(+) 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 bb9bbab729d..e6557c6c9ea 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -6,6 +6,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; {{#withXml}} @XmlAccessorType(XmlAccessType.FIELD) @@ -46,6 +47,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{/maximum}} * @return {{name}} **/ + @JsonProperty("{{name}}") {{#vendorExtensions.extraAnnotation}} {{{vendorExtensions.extraAnnotation}}} {{/vendorExtensions.extraAnnotation}} From ea2a2d9106ad0e8259da515b7d73c4e165cc807f Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Mon, 16 Oct 2017 18:33:14 -0500 Subject: [PATCH 3/8] Update of the Petstore CXF server sample --- .../swagger/model/AdditionalPropertiesClass.java | 3 +++ .../src/gen/java/io/swagger/model/Animal.java | 3 +++ .../src/gen/java/io/swagger/model/AnimalFarm.java | 1 + .../io/swagger/model/ArrayOfArrayOfNumberOnly.java | 2 ++ .../java/io/swagger/model/ArrayOfNumberOnly.java | 2 ++ .../src/gen/java/io/swagger/model/ArrayTest.java | 4 ++++ .../gen/java/io/swagger/model/Capitalization.java | 7 +++++++ .../src/gen/java/io/swagger/model/Cat.java | 2 ++ .../src/gen/java/io/swagger/model/Category.java | 3 +++ .../src/gen/java/io/swagger/model/ClassModel.java | 2 ++ .../src/gen/java/io/swagger/model/Client.java | 2 ++ .../src/gen/java/io/swagger/model/Dog.java | 2 ++ .../src/gen/java/io/swagger/model/EnumArrays.java | 3 +++ .../src/gen/java/io/swagger/model/EnumTest.java | 5 +++++ .../src/gen/java/io/swagger/model/FormatTest.java | 14 ++++++++++++++ .../gen/java/io/swagger/model/HasOnlyReadOnly.java | 3 +++ .../src/gen/java/io/swagger/model/MapTest.java | 3 +++ ...ixedPropertiesAndAdditionalPropertiesClass.java | 4 ++++ .../java/io/swagger/model/Model200Response.java | 3 +++ .../java/io/swagger/model/ModelApiResponse.java | 4 ++++ .../src/gen/java/io/swagger/model/ModelReturn.java | 2 ++ .../src/gen/java/io/swagger/model/Name.java | 5 +++++ .../src/gen/java/io/swagger/model/NumberOnly.java | 2 ++ .../src/gen/java/io/swagger/model/Order.java | 7 +++++++ .../gen/java/io/swagger/model/OuterComposite.java | 4 ++++ .../src/gen/java/io/swagger/model/Pet.java | 7 +++++++ .../gen/java/io/swagger/model/ReadOnlyFirst.java | 3 +++ .../java/io/swagger/model/SpecialModelName.java | 2 ++ .../src/gen/java/io/swagger/model/Tag.java | 3 +++ .../src/gen/java/io/swagger/model/User.java | 9 +++++++++ 30 files changed, 116 insertions(+) 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 2a684fce3bd..7c2de12a87e 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class AdditionalPropertiesClass { @@ -25,6 +26,7 @@ public class AdditionalPropertiesClass { * Get mapProperty * @return mapProperty **/ + @JsonProperty("mapProperty") public Map getMapProperty() { return mapProperty; } @@ -47,6 +49,7 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper * Get mapOfMapProperty * @return mapOfMapProperty **/ + @JsonProperty("mapOfMapProperty") public Map> getMapOfMapProperty() { return mapOfMapProperty; } 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 7b8b9faa45e..29ad41d9e98 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 @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Animal { @@ -24,6 +25,7 @@ public class Animal { * Get className * @return className **/ + @JsonProperty("className") @NotNull public String getClassName() { return className; @@ -42,6 +44,7 @@ public Animal className(String className) { * Get color * @return color **/ + @JsonProperty("color") public String getColor() { return color; } 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 b9ceb010054..e3ea311206f 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class AnimalFarm extends ArrayList { 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 cf72f92cd9e..9340f1e2edc 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfArrayOfNumberOnly { @@ -23,6 +24,7 @@ public class ArrayOfArrayOfNumberOnly { * Get arrayArrayNumber * @return arrayArrayNumber **/ + @JsonProperty("arrayArrayNumber") public List> getArrayArrayNumber() { 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 6c1b6335d96..e4381bd2575 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfNumberOnly { @@ -23,6 +24,7 @@ public class ArrayOfNumberOnly { * Get arrayNumber * @return arrayNumber **/ + @JsonProperty("arrayNumber") public List getArrayNumber() { 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 36523b49963..82cec1cb624 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayTest { @@ -27,6 +28,7 @@ public class ArrayTest { * Get arrayOfString * @return arrayOfString **/ + @JsonProperty("arrayOfString") public List getArrayOfString() { return arrayOfString; } @@ -49,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayArrayOfInteger * @return arrayArrayOfInteger **/ + @JsonProperty("arrayArrayOfInteger") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -71,6 +74,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfModel * @return arrayArrayOfModel **/ + @JsonProperty("arrayArrayOfModel") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } 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 8d25cc55cb3..ee83699c455 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Capitalization { @@ -30,6 +31,7 @@ public class Capitalization { * Get smallCamel * @return smallCamel **/ + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -47,6 +49,7 @@ public Capitalization smallCamel(String smallCamel) { * Get capitalCamel * @return capitalCamel **/ + @JsonProperty("capitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -64,6 +67,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get smallSnake * @return smallSnake **/ + @JsonProperty("smallSnake") public String getSmallSnake() { return smallSnake; } @@ -81,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) { * Get capitalSnake * @return capitalSnake **/ + @JsonProperty("capitalSnake") public String getCapitalSnake() { return capitalSnake; } @@ -98,6 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get scAETHFlowPoints * @return scAETHFlowPoints **/ + @JsonProperty("scAETHFlowPoints") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -115,6 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { * Name of the pet * @return ATT_NAME **/ + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } 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 490db608125..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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Cat extends Animal { @@ -21,6 +22,7 @@ public class Cat extends Animal { * Get declawed * @return declawed **/ + @JsonProperty("declawed") public Boolean isDeclawed() { 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 6abf3c9c6cb..d16c0c2d3d4 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Category { @@ -22,6 +23,7 @@ public class Category { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public Category id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } 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 9f4a079d27a..117069d1a53 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Model for testing model with \"_class\" property") public class ClassModel { @@ -22,6 +23,7 @@ public class ClassModel { * Get propertyClass * @return propertyClass **/ + @JsonProperty("propertyClass") public String getPropertyClass() { 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 c3eff86cc82..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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Client { @@ -20,6 +21,7 @@ public class Client { * Get client * @return client **/ + @JsonProperty("client") public String getClient() { 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 80aaf8dcfdd..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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Dog extends Animal { @@ -21,6 +22,7 @@ public class Dog extends Animal { * Get breed * @return breed **/ + @JsonProperty("breed") public String getBreed() { 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 1a76571a267..c6f1457239e 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 @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumArrays { @@ -90,6 +91,7 @@ public static ArrayEnumEnum fromValue(String v) { * Get justSymbol * @return justSymbol **/ + @JsonProperty("justSymbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -107,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get arrayEnum * @return arrayEnum **/ + @JsonProperty("arrayEnum") public List getArrayEnum() { return arrayEnum; } 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 44199a514af..c6f68e1fa6a 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumTest { @@ -126,6 +127,7 @@ public static EnumNumberEnum fromValue(String v) { * Get enumString * @return enumString **/ + @JsonProperty("enumString") public EnumStringEnum getEnumString() { return enumString; } @@ -143,6 +145,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumInteger * @return enumInteger **/ + @JsonProperty("enumInteger") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -160,6 +163,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumNumber * @return enumNumber **/ + @JsonProperty("enumNumber") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -177,6 +181,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) { * Get outerEnum * @return outerEnum **/ + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } 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 bbb02c85253..1ab62d2797c 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 @@ -14,6 +14,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class FormatTest { @@ -50,6 +51,7 @@ public class FormatTest { * maximum: 100 * @return integer **/ + @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { return integer; } @@ -69,6 +71,7 @@ public FormatTest integer(Integer integer) { * maximum: 200 * @return int32 **/ + @JsonProperty("int32") @Min(20) @Max(200) public Integer getInt32() { return int32; } @@ -86,6 +89,7 @@ public FormatTest int32(Integer int32) { * Get int64 * @return int64 **/ + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -105,6 +109,7 @@ public FormatTest int64(Long int64) { * maximum: 543.2 * @return number **/ + @JsonProperty("number") @NotNull @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; @@ -125,6 +130,7 @@ public FormatTest number(BigDecimal number) { * maximum: 987.6 * @return _float **/ + @JsonProperty("_float") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { return _float; } @@ -144,6 +150,7 @@ public FormatTest _float(Float _float) { * maximum: 123.4 * @return _double **/ + @JsonProperty("_double") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { return _double; } @@ -161,6 +168,7 @@ public FormatTest _double(Double _double) { * Get string * @return string **/ + @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { return string; } @@ -178,6 +186,7 @@ public FormatTest string(String string) { * Get _byte * @return _byte **/ + @JsonProperty("_byte") @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; @@ -196,6 +205,7 @@ public FormatTest _byte(byte[] _byte) { * Get binary * @return binary **/ + @JsonProperty("binary") public byte[] getBinary() { return binary; } @@ -213,6 +223,7 @@ public FormatTest binary(byte[] binary) { * Get date * @return date **/ + @JsonProperty("date") @NotNull public LocalDate getDate() { return date; @@ -231,6 +242,7 @@ public FormatTest date(LocalDate date) { * Get dateTime * @return dateTime **/ + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -248,6 +260,7 @@ public FormatTest dateTime(Date dateTime) { * Get uuid * @return uuid **/ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -265,6 +278,7 @@ public FormatTest uuid(UUID uuid) { * Get password * @return password **/ + @JsonProperty("password") @NotNull @Size(min=10,max=64) public String getPassword() { return password; 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 975088e5928..079686f4d3f 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class HasOnlyReadOnly { @@ -22,6 +23,7 @@ public class HasOnlyReadOnly { * Get bar * @return bar **/ + @JsonProperty("bar") public String getBar() { return bar; } @@ -31,6 +33,7 @@ public String getBar() { * Get foo * @return foo **/ + @JsonProperty("foo") public String getFoo() { return foo; } 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 896bfc54829..17ea1e36ed8 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 @@ -13,6 +13,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class MapTest { @@ -58,6 +59,7 @@ public static InnerEnum fromValue(String v) { * Get mapMapOfString * @return mapMapOfString **/ + @JsonProperty("mapMapOfString") public Map> getMapMapOfString() { return mapMapOfString; } @@ -80,6 +82,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapOfEnumString * @return mapOfEnumString **/ + @JsonProperty("mapOfEnumString") public Map getMapOfEnumString() { return mapOfEnumString; } 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 51f18692f46..fa87343a7e6 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 @@ -16,6 +16,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class MixedPropertiesAndAdditionalPropertiesClass { @@ -30,6 +31,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { * Get uuid * @return uuid **/ + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -47,6 +49,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { * Get dateTime * @return dateTime **/ + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -64,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) { * Get map * @return map **/ + @JsonProperty("map") public Map getMap() { return map; } 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 1f2a89db5d3..88658de7072 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Model for testing model name starting with number") public class Model200Response { @@ -24,6 +25,7 @@ public class Model200Response { * Get name * @return name **/ + @JsonProperty("name") public Integer getName() { return name; } @@ -41,6 +43,7 @@ public Model200Response name(Integer name) { * Get propertyClass * @return propertyClass **/ + @JsonProperty("propertyClass") public String getPropertyClass() { return propertyClass; } 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 536fecd5949..1b313aaa3a0 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class ModelApiResponse { @@ -24,6 +25,7 @@ public class ModelApiResponse { * Get code * @return code **/ + @JsonProperty("code") public Integer getCode() { return code; } @@ -41,6 +43,7 @@ public ModelApiResponse code(Integer code) { * Get type * @return type **/ + @JsonProperty("type") public String getType() { return type; } @@ -58,6 +61,7 @@ public ModelApiResponse type(String type) { * Get message * @return message **/ + @JsonProperty("message") public String getMessage() { return message; } 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 3a56f9c8683..5ac21c30c33 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Model for testing reserved words") public class ModelReturn { @@ -22,6 +23,7 @@ public class ModelReturn { * Get _return * @return _return **/ + @JsonProperty("_return") public Integer getReturn() { 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 d5edcadd585..d57b11c6cd7 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Model for testing model name same as property name") public class Name { @@ -28,6 +29,7 @@ public class Name { * Get name * @return name **/ + @JsonProperty("name") @NotNull public Integer getName() { return name; @@ -46,6 +48,7 @@ public Name name(Integer name) { * Get snakeCase * @return snakeCase **/ + @JsonProperty("snakeCase") public Integer getSnakeCase() { return snakeCase; } @@ -55,6 +58,7 @@ public Integer getSnakeCase() { * Get property * @return property **/ + @JsonProperty("property") public String getProperty() { return property; } @@ -72,6 +76,7 @@ public Name property(String property) { * Get _123Number * @return _123Number **/ + @JsonProperty("_123Number") public Integer get123Number() { return _123Number; } 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 60e46381901..b154acdef07 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class NumberOnly { @@ -21,6 +22,7 @@ public class NumberOnly { * Get justNumber * @return justNumber **/ + @JsonProperty("justNumber") public BigDecimal getJustNumber() { 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 c479b33bc35..faf95343915 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Order { @@ -64,6 +65,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -81,6 +83,7 @@ public Order id(Long id) { * Get petId * @return petId **/ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -98,6 +101,7 @@ public Order petId(Long petId) { * Get quantity * @return quantity **/ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -115,6 +119,7 @@ public Order quantity(Integer quantity) { * Get shipDate * @return shipDate **/ + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -132,6 +137,7 @@ public Order shipDate(Date shipDate) { * Order Status * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -149,6 +155,7 @@ public Order status(StatusEnum status) { * Get complete * @return complete **/ + @JsonProperty("complete") public Boolean isComplete() { return complete; } 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 264121fb46d..67da8f390b7 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 @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class OuterComposite { @@ -25,6 +26,7 @@ public class OuterComposite { * Get myNumber * @return myNumber **/ + @JsonProperty("myNumber") public BigDecimal getMyNumber() { return myNumber; } @@ -42,6 +44,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myString * @return myString **/ + @JsonProperty("myString") public String getMyString() { return myString; } @@ -59,6 +62,7 @@ public OuterComposite myString(String myString) { * Get myBoolean * @return myBoolean **/ + @JsonProperty("myBoolean") public Boolean getMyBoolean() { return myBoolean; } 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 4d6215faf10..5db1a052b8f 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 @@ -14,6 +14,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Pet { @@ -67,6 +68,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -84,6 +86,7 @@ public Pet id(Long id) { * Get category * @return category **/ + @JsonProperty("category") public Category getCategory() { return category; } @@ -101,6 +104,7 @@ public Pet category(Category category) { * Get name * @return name **/ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -119,6 +123,7 @@ public Pet name(String name) { * Get photoUrls * @return photoUrls **/ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -142,6 +147,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get tags * @return tags **/ + @JsonProperty("tags") public List getTags() { return tags; } @@ -164,6 +170,7 @@ public Pet addTagsItem(Tag tagsItem) { * pet status in the store * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } 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 f6868a7d344..d6c2527bc13 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class ReadOnlyFirst { @@ -22,6 +23,7 @@ public class ReadOnlyFirst { * Get bar * @return bar **/ + @JsonProperty("bar") public String getBar() { return bar; } @@ -31,6 +33,7 @@ public String getBar() { * Get baz * @return baz **/ + @JsonProperty("baz") public String getBaz() { return baz; } 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 ebf181b8db6..caddb29de5f 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class SpecialModelName { @@ -20,6 +21,7 @@ public class SpecialModelName { * Get specialPropertyName * @return specialPropertyName **/ + @JsonProperty("specialPropertyName") public Long getSpecialPropertyName() { 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 40cf3188aa7..77d43ac52eb 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class Tag { @@ -22,6 +23,7 @@ public class Tag { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public Tag id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } 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 dd95f042ad1..54f54896d13 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 @@ -10,6 +10,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; public class User { @@ -34,6 +35,7 @@ public class User { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -51,6 +53,7 @@ public User id(Long id) { * Get username * @return username **/ + @JsonProperty("username") public String getUsername() { return username; } @@ -68,6 +71,7 @@ public User username(String username) { * Get firstName * @return firstName **/ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -85,6 +89,7 @@ public User firstName(String firstName) { * Get lastName * @return lastName **/ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -102,6 +107,7 @@ public User lastName(String lastName) { * Get email * @return email **/ + @JsonProperty("email") public String getEmail() { return email; } @@ -119,6 +125,7 @@ public User email(String email) { * Get password * @return password **/ + @JsonProperty("password") public String getPassword() { return password; } @@ -136,6 +143,7 @@ public User password(String password) { * Get phone * @return phone **/ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -153,6 +161,7 @@ public User phone(String phone) { * User Status * @return userStatus **/ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } From 992449d8d3e96e1012d0e5e62929b106c288d9a4 Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Mon, 16 Oct 2017 18:34:38 -0500 Subject: [PATCH 4/8] Update of the Petstore CXF client sample --- .../src/gen/java/io/swagger/model/Category.java | 3 +++ .../src/gen/java/io/swagger/model/ModelApiResponse.java | 4 ++++ .../src/gen/java/io/swagger/model/Order.java | 7 +++++++ .../src/gen/java/io/swagger/model/Pet.java | 7 +++++++ .../src/gen/java/io/swagger/model/Tag.java | 3 +++ .../src/gen/java/io/swagger/model/User.java | 9 +++++++++ 6 files changed, 33 insertions(+) diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java index c6076fb8df8..2e1f5c0c2a8 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Category.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A category for a pet") public class Category { @@ -24,6 +25,7 @@ public class Category { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Category id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java index 4877f3ace31..c6dc9cbecf6 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @@ -26,6 +27,7 @@ public class ModelApiResponse { * Get code * @return code **/ + @JsonProperty("code") public Integer getCode() { return code; } @@ -43,6 +45,7 @@ public ModelApiResponse code(Integer code) { * Get type * @return type **/ + @JsonProperty("type") public String getType() { return type; } @@ -60,6 +63,7 @@ public ModelApiResponse type(String type) { * Get message * @return message **/ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java index 5b4a67f50c1..f3083f27494 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Order.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="An order for a pets from the pet store") public class Order { @@ -66,6 +67,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -83,6 +85,7 @@ public Order id(Long id) { * Get petId * @return petId **/ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -100,6 +103,7 @@ public Order petId(Long petId) { * Get quantity * @return quantity **/ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -117,6 +121,7 @@ public Order quantity(Integer quantity) { * Get shipDate * @return shipDate **/ + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -134,6 +139,7 @@ public Order shipDate(Date shipDate) { * Order Status * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -151,6 +157,7 @@ public Order status(StatusEnum status) { * Get complete * @return complete **/ + @JsonProperty("complete") public Boolean isComplete() { return complete; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java index 15f9322a95a..0776e03a908 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Pet.java @@ -15,6 +15,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A pet for sale in the pet store") public class Pet { @@ -69,6 +70,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -86,6 +88,7 @@ public Pet id(Long id) { * Get category * @return category **/ + @JsonProperty("category") public Category getCategory() { return category; } @@ -103,6 +106,7 @@ public Pet category(Category category) { * Get name * @return name **/ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -121,6 +125,7 @@ public Pet name(String name) { * Get photoUrls * @return photoUrls **/ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -144,6 +149,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get tags * @return tags **/ + @JsonProperty("tags") public List getTags() { return tags; } @@ -166,6 +172,7 @@ public Pet addTagsItem(Tag tagsItem) { * pet status in the store * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java index a0bfd24470f..1e80911874f 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/Tag.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A tag for a pet") public class Tag { @@ -24,6 +25,7 @@ public class Tag { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Tag id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java index 74b908a3aa3..a0f42ad1ce7 100644 --- a/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java +++ b/samples/client/petstore/jaxrs-cxf-client/src/gen/java/io/swagger/model/User.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A User who is purchasing from the pet store") public class User { @@ -36,6 +37,7 @@ public class User { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -53,6 +55,7 @@ public User id(Long id) { * Get username * @return username **/ + @JsonProperty("username") public String getUsername() { return username; } @@ -70,6 +73,7 @@ public User username(String username) { * Get firstName * @return firstName **/ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -87,6 +91,7 @@ public User firstName(String firstName) { * Get lastName * @return lastName **/ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -104,6 +109,7 @@ public User lastName(String lastName) { * Get email * @return email **/ + @JsonProperty("email") public String getEmail() { return email; } @@ -121,6 +127,7 @@ public User email(String email) { * Get password * @return password **/ + @JsonProperty("password") public String getPassword() { return password; } @@ -138,6 +145,7 @@ public User password(String password) { * Get phone * @return phone **/ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -155,6 +163,7 @@ public User phone(String phone) { * User Status * @return userStatus **/ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } From b96e57527d52be1988c55b5ebc0295453a3c9ecd Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Mon, 16 Oct 2017 18:35:49 -0500 Subject: [PATCH 5/8] Update of the Petstore CXF server annotated base path sample --- .../src/gen/java/io/swagger/model/Category.java | 3 +++ .../src/gen/java/io/swagger/model/ModelApiResponse.java | 4 ++++ .../src/gen/java/io/swagger/model/Order.java | 7 +++++++ .../src/gen/java/io/swagger/model/Pet.java | 7 +++++++ .../src/gen/java/io/swagger/model/Tag.java | 3 +++ .../src/gen/java/io/swagger/model/User.java | 9 +++++++++ 6 files changed, 33 insertions(+) diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Category.java index c6076fb8df8..2e1f5c0c2a8 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Category.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A category for a pet") public class Category { @@ -24,6 +25,7 @@ public class Category { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Category id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/ModelApiResponse.java index 4877f3ace31..c6dc9cbecf6 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @@ -26,6 +27,7 @@ public class ModelApiResponse { * Get code * @return code **/ + @JsonProperty("code") public Integer getCode() { return code; } @@ -43,6 +45,7 @@ public ModelApiResponse code(Integer code) { * Get type * @return type **/ + @JsonProperty("type") public String getType() { return type; } @@ -60,6 +63,7 @@ public ModelApiResponse type(String type) { * Get message * @return message **/ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Order.java index 5b4a67f50c1..f3083f27494 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Order.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="An order for a pets from the pet store") public class Order { @@ -66,6 +67,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -83,6 +85,7 @@ public Order id(Long id) { * Get petId * @return petId **/ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -100,6 +103,7 @@ public Order petId(Long petId) { * Get quantity * @return quantity **/ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -117,6 +121,7 @@ public Order quantity(Integer quantity) { * Get shipDate * @return shipDate **/ + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -134,6 +139,7 @@ public Order shipDate(Date shipDate) { * Order Status * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -151,6 +157,7 @@ public Order status(StatusEnum status) { * Get complete * @return complete **/ + @JsonProperty("complete") public Boolean isComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Pet.java index 15f9322a95a..0776e03a908 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Pet.java @@ -15,6 +15,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A pet for sale in the pet store") public class Pet { @@ -69,6 +70,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -86,6 +88,7 @@ public Pet id(Long id) { * Get category * @return category **/ + @JsonProperty("category") public Category getCategory() { return category; } @@ -103,6 +106,7 @@ public Pet category(Category category) { * Get name * @return name **/ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -121,6 +125,7 @@ public Pet name(String name) { * Get photoUrls * @return photoUrls **/ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -144,6 +149,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get tags * @return tags **/ + @JsonProperty("tags") public List getTags() { return tags; } @@ -166,6 +172,7 @@ public Pet addTagsItem(Tag tagsItem) { * pet status in the store * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Tag.java index a0bfd24470f..1e80911874f 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/Tag.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A tag for a pet") public class Tag { @@ -24,6 +25,7 @@ public class Tag { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Tag id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/User.java index 74b908a3aa3..a0f42ad1ce7 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/io/swagger/model/User.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A User who is purchasing from the pet store") public class User { @@ -36,6 +37,7 @@ public class User { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -53,6 +55,7 @@ public User id(Long id) { * Get username * @return username **/ + @JsonProperty("username") public String getUsername() { return username; } @@ -70,6 +73,7 @@ public User username(String username) { * Get firstName * @return firstName **/ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -87,6 +91,7 @@ public User firstName(String firstName) { * Get lastName * @return lastName **/ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -104,6 +109,7 @@ public User lastName(String lastName) { * Get email * @return email **/ + @JsonProperty("email") public String getEmail() { return email; } @@ -121,6 +127,7 @@ public User email(String email) { * Get password * @return password **/ + @JsonProperty("password") public String getPassword() { return password; } @@ -138,6 +145,7 @@ public User password(String password) { * Get phone * @return phone **/ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -155,6 +163,7 @@ public User phone(String phone) { * User Status * @return userStatus **/ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } From b9e08f66e91fb97af6c9144947fae6e25d09b40e Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Mon, 16 Oct 2017 18:37:46 -0500 Subject: [PATCH 6/8] Update of the Petstore CXF server non spring application sample --- .../src/gen/java/io/swagger/model/Category.java | 3 +++ .../src/gen/java/io/swagger/model/ModelApiResponse.java | 4 ++++ .../src/gen/java/io/swagger/model/Order.java | 7 +++++++ .../src/gen/java/io/swagger/model/Pet.java | 7 +++++++ .../src/gen/java/io/swagger/model/Tag.java | 3 +++ .../src/gen/java/io/swagger/model/User.java | 9 +++++++++ 6 files changed, 33 insertions(+) diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java index c6076fb8df8..2e1f5c0c2a8 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Category.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A category for a pet") public class Category { @@ -24,6 +25,7 @@ public class Category { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Category id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java index 4877f3ace31..c6dc9cbecf6 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="Describes the result of uploading an image resource") public class ModelApiResponse { @@ -26,6 +27,7 @@ public class ModelApiResponse { * Get code * @return code **/ + @JsonProperty("code") public Integer getCode() { return code; } @@ -43,6 +45,7 @@ public ModelApiResponse code(Integer code) { * Get type * @return type **/ + @JsonProperty("type") public String getType() { return type; } @@ -60,6 +63,7 @@ public ModelApiResponse type(String type) { * Get message * @return message **/ + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java index 5b4a67f50c1..f3083f27494 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Order.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="An order for a pets from the pet store") public class Order { @@ -66,6 +67,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -83,6 +85,7 @@ public Order id(Long id) { * Get petId * @return petId **/ + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -100,6 +103,7 @@ public Order petId(Long petId) { * Get quantity * @return quantity **/ + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -117,6 +121,7 @@ public Order quantity(Integer quantity) { * Get shipDate * @return shipDate **/ + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -134,6 +139,7 @@ public Order shipDate(Date shipDate) { * Order Status * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -151,6 +157,7 @@ public Order status(StatusEnum status) { * Get complete * @return complete **/ + @JsonProperty("complete") public Boolean isComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java index 15f9322a95a..0776e03a908 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Pet.java @@ -15,6 +15,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A pet for sale in the pet store") public class Pet { @@ -69,6 +70,7 @@ public static StatusEnum fromValue(String v) { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -86,6 +88,7 @@ public Pet id(Long id) { * Get category * @return category **/ + @JsonProperty("category") public Category getCategory() { return category; } @@ -103,6 +106,7 @@ public Pet category(Category category) { * Get name * @return name **/ + @JsonProperty("name") @NotNull public String getName() { return name; @@ -121,6 +125,7 @@ public Pet name(String name) { * Get photoUrls * @return photoUrls **/ + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -144,6 +149,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) { * Get tags * @return tags **/ + @JsonProperty("tags") public List getTags() { return tags; } @@ -166,6 +172,7 @@ public Pet addTagsItem(Tag tagsItem) { * pet status in the store * @return status **/ + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java index a0bfd24470f..1e80911874f 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/Tag.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A tag for a pet") public class Tag { @@ -24,6 +25,7 @@ public class Tag { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -41,6 +43,7 @@ public Tag id(Long id) { * Get name * @return name **/ + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java index 74b908a3aa3..a0f42ad1ce7 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/io/swagger/model/User.java @@ -11,6 +11,7 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description="A User who is purchasing from the pet store") public class User { @@ -36,6 +37,7 @@ public class User { * Get id * @return id **/ + @JsonProperty("id") public Long getId() { return id; } @@ -53,6 +55,7 @@ public User id(Long id) { * Get username * @return username **/ + @JsonProperty("username") public String getUsername() { return username; } @@ -70,6 +73,7 @@ public User username(String username) { * Get firstName * @return firstName **/ + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -87,6 +91,7 @@ public User firstName(String firstName) { * Get lastName * @return lastName **/ + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -104,6 +109,7 @@ public User lastName(String lastName) { * Get email * @return email **/ + @JsonProperty("email") public String getEmail() { return email; } @@ -121,6 +127,7 @@ public User email(String email) { * Get password * @return password **/ + @JsonProperty("password") public String getPassword() { return password; } @@ -138,6 +145,7 @@ public User password(String password) { * Get phone * @return phone **/ + @JsonProperty("phone") public String getPhone() { return phone; } @@ -155,6 +163,7 @@ public User phone(String phone) { * User Status * @return userStatus **/ + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } From 9b50678f328f3d281b18110734fa5f5c0f33b96d Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Wed, 18 Oct 2017 22:29:51 -0500 Subject: [PATCH 7/8] Changed {{name}} for {{baseName}} following the correction posted by @wing328 --- .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6557c6c9ea..0412381d534 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -47,7 +47,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{/maximum}} * @return {{name}} **/ - @JsonProperty("{{name}}") + @JsonProperty("{{baseName}}") {{#vendorExtensions.extraAnnotation}} {{{vendorExtensions.extraAnnotation}}} {{/vendorExtensions.extraAnnotation}} From 1f6044ffbd2c40c7c1ce795ecca1ab935029aa67 Mon Sep 17 00:00:00 2001 From: Gustavo Paz Date: Wed, 18 Oct 2017 22:38:57 -0500 Subject: [PATCH 8/8] Update of the Petstore CXF server sample --- .../java/io/swagger/model/AdditionalPropertiesClass.java | 4 ++-- .../java/io/swagger/model/ArrayOfArrayOfNumberOnly.java | 2 +- .../src/gen/java/io/swagger/model/ArrayOfNumberOnly.java | 2 +- .../src/gen/java/io/swagger/model/ArrayTest.java | 6 +++--- .../src/gen/java/io/swagger/model/Capitalization.java | 8 ++++---- .../src/gen/java/io/swagger/model/ClassModel.java | 2 +- .../src/gen/java/io/swagger/model/EnumArrays.java | 4 ++-- .../jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java | 6 +++--- .../src/gen/java/io/swagger/model/FormatTest.java | 6 +++--- .../jaxrs-cxf/src/gen/java/io/swagger/model/MapTest.java | 4 ++-- .../src/gen/java/io/swagger/model/Model200Response.java | 2 +- .../src/gen/java/io/swagger/model/ModelReturn.java | 2 +- .../jaxrs-cxf/src/gen/java/io/swagger/model/Name.java | 4 ++-- .../src/gen/java/io/swagger/model/NumberOnly.java | 2 +- .../src/gen/java/io/swagger/model/OuterComposite.java | 6 +++--- .../src/gen/java/io/swagger/model/SpecialModelName.java | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) 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 7c2de12a87e..0fd4f04aeea 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 @@ -26,7 +26,7 @@ public class AdditionalPropertiesClass { * Get mapProperty * @return mapProperty **/ - @JsonProperty("mapProperty") + @JsonProperty("map_property") public Map getMapProperty() { return mapProperty; } @@ -49,7 +49,7 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper * Get mapOfMapProperty * @return mapOfMapProperty **/ - @JsonProperty("mapOfMapProperty") + @JsonProperty("map_of_map_property") public Map> getMapOfMapProperty() { return mapOfMapProperty; } 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 9340f1e2edc..da2ba2eba34 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 @@ -24,7 +24,7 @@ public class ArrayOfArrayOfNumberOnly { * Get arrayArrayNumber * @return arrayArrayNumber **/ - @JsonProperty("arrayArrayNumber") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { 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 e4381bd2575..30ad053c214 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 @@ -24,7 +24,7 @@ public class ArrayOfNumberOnly { * Get arrayNumber * @return arrayNumber **/ - @JsonProperty("arrayNumber") + @JsonProperty("ArrayNumber") public List getArrayNumber() { 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 82cec1cb624..c76d50e816f 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 @@ -28,7 +28,7 @@ public class ArrayTest { * Get arrayOfString * @return arrayOfString **/ - @JsonProperty("arrayOfString") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { * Get arrayArrayOfInteger * @return arrayArrayOfInteger **/ - @JsonProperty("arrayArrayOfInteger") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -74,7 +74,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) * Get arrayArrayOfModel * @return arrayArrayOfModel **/ - @JsonProperty("arrayArrayOfModel") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } 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 ee83699c455..ce100b22300 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 @@ -49,7 +49,7 @@ public Capitalization smallCamel(String smallCamel) { * Get capitalCamel * @return capitalCamel **/ - @JsonProperty("capitalCamel") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -67,7 +67,7 @@ public Capitalization capitalCamel(String capitalCamel) { * Get smallSnake * @return smallSnake **/ - @JsonProperty("smallSnake") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -85,7 +85,7 @@ public Capitalization smallSnake(String smallSnake) { * Get capitalSnake * @return capitalSnake **/ - @JsonProperty("capitalSnake") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -103,7 +103,7 @@ public Capitalization capitalSnake(String capitalSnake) { * Get scAETHFlowPoints * @return scAETHFlowPoints **/ - @JsonProperty("scAETHFlowPoints") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } 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 117069d1a53..6cc8af52fc6 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 @@ -23,7 +23,7 @@ public class ClassModel { * Get propertyClass * @return propertyClass **/ - @JsonProperty("propertyClass") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } 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 c6f1457239e..3af69f2f844 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 @@ -91,7 +91,7 @@ public static ArrayEnumEnum fromValue(String v) { * Get justSymbol * @return justSymbol **/ - @JsonProperty("justSymbol") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) { * Get arrayEnum * @return arrayEnum **/ - @JsonProperty("arrayEnum") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } 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 c6f68e1fa6a..d573a77a98b 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 @@ -127,7 +127,7 @@ public static EnumNumberEnum fromValue(String v) { * Get enumString * @return enumString **/ - @JsonProperty("enumString") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -145,7 +145,7 @@ public EnumTest enumString(EnumStringEnum enumString) { * Get enumInteger * @return enumInteger **/ - @JsonProperty("enumInteger") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -163,7 +163,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) { * Get enumNumber * @return enumNumber **/ - @JsonProperty("enumNumber") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } 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 1ab62d2797c..1e90851cede 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 @@ -130,7 +130,7 @@ public FormatTest number(BigDecimal number) { * maximum: 987.6 * @return _float **/ - @JsonProperty("_float") + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { return _float; } @@ -150,7 +150,7 @@ public FormatTest _float(Float _float) { * maximum: 123.4 * @return _double **/ - @JsonProperty("_double") + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { return _double; } @@ -186,7 +186,7 @@ public FormatTest string(String string) { * Get _byte * @return _byte **/ - @JsonProperty("_byte") + @JsonProperty("byte") @NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { return _byte; 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 17ea1e36ed8..cf29fcfb87d 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 @@ -59,7 +59,7 @@ public static InnerEnum fromValue(String v) { * Get mapMapOfString * @return mapMapOfString **/ - @JsonProperty("mapMapOfString") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -82,7 +82,7 @@ public MapTest putMapMapOfStringItem(String key, Map mapMapOfStr * Get mapOfEnumString * @return mapOfEnumString **/ - @JsonProperty("mapOfEnumString") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } 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 88658de7072..8fe54f0a258 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 @@ -43,7 +43,7 @@ public Model200Response name(Integer name) { * Get propertyClass * @return propertyClass **/ - @JsonProperty("propertyClass") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } 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 5ac21c30c33..df4149c5d4d 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 @@ -23,7 +23,7 @@ public class ModelReturn { * Get _return * @return _return **/ - @JsonProperty("_return") + @JsonProperty("return") public Integer getReturn() { 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 d57b11c6cd7..47a8c83f2fb 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 @@ -48,7 +48,7 @@ public Name name(Integer name) { * Get snakeCase * @return snakeCase **/ - @JsonProperty("snakeCase") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -76,7 +76,7 @@ public Name property(String property) { * Get _123Number * @return _123Number **/ - @JsonProperty("_123Number") + @JsonProperty("123Number") public Integer get123Number() { return _123Number; } 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 b154acdef07..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 @@ -22,7 +22,7 @@ public class NumberOnly { * Get justNumber * @return justNumber **/ - @JsonProperty("justNumber") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } 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 67da8f390b7..82c7d8fa9d9 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 @@ -26,7 +26,7 @@ public class OuterComposite { * Get myNumber * @return myNumber **/ - @JsonProperty("myNumber") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -44,7 +44,7 @@ public OuterComposite myNumber(BigDecimal myNumber) { * Get myString * @return myString **/ - @JsonProperty("myString") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -62,7 +62,7 @@ public OuterComposite myString(String myString) { * Get myBoolean * @return myBoolean **/ - @JsonProperty("myBoolean") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } 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 caddb29de5f..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 @@ -21,7 +21,7 @@ public class SpecialModelName { * Get specialPropertyName * @return specialPropertyName **/ - @JsonProperty("specialPropertyName") + @JsonProperty("$special[property.name]") public Long getSpecialPropertyName() { return specialPropertyName; }