diff --git a/bin/windows/jaxrs-spec-petstore-server-interface.bat b/bin/windows/jaxrs-spec-petstore-server-interface.bat new file mode 100644 index 00000000000..5ca4f38101e --- /dev/null +++ b/bin/windows/jaxrs-spec-petstore-server-interface.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate --artifact-id "jaxrs-cxf-client-petstore-client" -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-spec -o samples\server\petstore\jaxrs-spec-interface -DhideGenerationTimestamp=true,serializableModel=true,interfaceOnly=true + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/jaxrs-spec-petstore-server.bat b/bin/windows/jaxrs-spec-petstore-server.bat new file mode 100644 index 00000000000..30c19a50891 --- /dev/null +++ b/bin/windows/jaxrs-spec-petstore-server.bat @@ -0,0 +1,10 @@ +set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar + +If Not Exist %executable% ( + mvn clean package +) + +REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties +set ags=generate --artifact-id "jaxrs-cxf-client-petstore-client" -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-spec -o samples\server\petstore\jaxrs-spec -DhideGenerationTimestamp=true,serializableModel=true + +java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache index ad84530e925..73d96a3b16b 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pojo.mustache @@ -1,5 +1,6 @@ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; {{#description}}@ApiModel(description = "{{{description}}}"){{/description}} public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} { @@ -29,6 +30,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali {{#vendorExtensions.extraAnnotation}}{{{vendorExtensions.extraAnnotation}}}{{/vendorExtensions.extraAnnotation}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}") + @JsonProperty("{{baseName}}") {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index 820bb4a2f18..6aa5fc2b980 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class AdditionalPropertiesClass implements Serializable { @@ -26,6 +27,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("map_property") public Map getMapProperty() { return mapProperty; } @@ -42,6 +44,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("map_of_map_property") public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Animal.java index f7aef656d44..bb54e9cad22 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Animal.java @@ -9,6 +9,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Animal implements Serializable { @@ -25,6 +26,7 @@ public class Animal implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("className") @NotNull public String getClassName() { return className; @@ -42,6 +44,7 @@ public class Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AnimalFarm.java index ca03cafd3ef..f14a33d343e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AnimalFarm.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/AnimalFarm.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class AnimalFarm extends ArrayList implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 558c55d50e1..0be06450317 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfArrayOfNumberOnly implements Serializable { @@ -25,6 +26,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index 780c9bf0df8..c131d2c633a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfNumberOnly implements Serializable { @@ -25,6 +26,7 @@ public class ArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayTest.java index f6ef76af0d6..1720cde126c 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ArrayTest.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayTest implements Serializable { @@ -27,6 +28,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -43,6 +45,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -59,6 +62,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Capitalization.java index 385c622b0ba..00402e4788a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Capitalization.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Capitalization implements Serializable { @@ -27,6 +28,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -43,6 +45,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -59,6 +62,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -75,6 +79,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -91,6 +96,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -108,6 +114,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Cat.java index f334fcd1914..086c6462d8e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Cat.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Cat extends Animal implements Serializable { @@ -23,6 +24,7 @@ public class Cat extends Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean isDeclawed() { return declawed; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Category.java index 5cee21d0404..1e5c20bf730 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Category.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Category implements Serializable { @@ -23,6 +24,7 @@ public class Category implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public class Category implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ClassModel.java index faa4cf796cb..c05c7b4a9b6 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ClassModel.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model with \"_class\" property") public class ClassModel implements Serializable { @@ -26,6 +27,7 @@ public class ClassModel implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Client.java index 55a8b4e31c0..61c2aef0512 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Client.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Client implements Serializable { @@ -22,6 +23,7 @@ public class Client implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Dog.java index e55012815c2..8c1d2c3f85b 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Dog.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Dog extends Animal implements Serializable { @@ -23,6 +24,7 @@ public class Dog extends Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumArrays.java index afb80283457..595f687217d 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumArrays.java @@ -9,6 +9,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumArrays implements Serializable { @@ -87,6 +88,7 @@ public enum ArrayEnumEnum { @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -103,6 +105,7 @@ public enum ArrayEnumEnum { @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumTest.java index 277fcf88e8d..d704287dd95 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/EnumTest.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumTest implements Serializable { @@ -119,6 +120,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -135,6 +137,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -151,6 +154,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -167,6 +171,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/FormatTest.java index 64d0e10f9a1..bb3072fe1e9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/FormatTest.java @@ -11,6 +11,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class FormatTest implements Serializable { @@ -40,6 +41,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { return integer; } @@ -58,6 +60,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("int32") @Min(20) @Max(200) public Integer getInt32() { return int32; } @@ -74,6 +77,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -92,6 +96,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("number") @NotNull @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; @@ -111,6 +116,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { return _float; } @@ -129,6 +135,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { return _double; } @@ -145,6 +152,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { return string; } @@ -161,6 +169,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @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; @@ -178,6 +187,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("binary") public byte[] getBinary() { return binary; } @@ -194,6 +204,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("date") @NotNull public LocalDate getDate() { return date; @@ -211,6 +222,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -227,6 +239,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -243,6 +256,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("password") @NotNull @Size(min=10,max=64) public String getPassword() { return password; diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index bef66ba21ee..ef9c2728846 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class HasOnlyReadOnly implements Serializable { @@ -23,6 +24,7 @@ public class HasOnlyReadOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -39,6 +41,7 @@ public class HasOnlyReadOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MapTest.java index ff256f599d4..54abae05490 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MapTest.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class MapTest implements Serializable { @@ -57,6 +58,7 @@ public enum InnerEnum { @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -73,6 +75,7 @@ public enum InnerEnum { @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index d72ca2af084..673adda125e 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -13,6 +13,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { @@ -30,6 +31,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -46,6 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -62,6 +65,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Model200Response.java index aedda176fb2..eeb8e7547cf 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Model200Response.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name starting with number") public class Model200Response implements Serializable { @@ -27,6 +28,7 @@ public class Model200Response implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -43,6 +45,7 @@ public class Model200Response implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelApiResponse.java index da860040d95..e97b1fdfd8b 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ModelApiResponse implements Serializable { @@ -24,6 +25,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -40,6 +42,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -56,6 +59,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelReturn.java index 1e17a101c64..72a677f7ab0 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ModelReturn.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing reserved words") public class ModelReturn implements Serializable { @@ -26,6 +27,7 @@ public class ModelReturn implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Name.java index 1c189b6e01d..5460ff8a9b9 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Name.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name same as property name") public class Name implements Serializable { @@ -29,6 +30,7 @@ public class Name implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("name") @NotNull public Integer getName() { return name; @@ -46,6 +48,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -62,6 +65,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -78,6 +82,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("123Number") public Integer get123Number() { return _123Number; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/NumberOnly.java index edff615a50d..5f02fd0649a 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/NumberOnly.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class NumberOnly implements Serializable { @@ -23,6 +24,7 @@ public class NumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Order.java index d7042477807..f7665f15a54 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Order.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Order implements Serializable { @@ -59,6 +60,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +77,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -91,6 +94,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -107,6 +111,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -124,6 +129,7 @@ public enum StatusEnum { @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -140,6 +146,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean isComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterComposite.java index c038e105892..bfe8211b654 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/OuterComposite.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class OuterComposite implements Serializable { @@ -25,6 +26,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -41,6 +43,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -57,6 +60,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Pet.java index 5bad5ba12d6..fc8a6796b79 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Pet.java @@ -11,6 +11,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Pet implements Serializable { @@ -62,6 +63,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -78,6 +80,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -94,6 +97,7 @@ public enum StatusEnum { @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") @NotNull public String getName() { return name; @@ -111,6 +115,7 @@ public enum StatusEnum { @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -128,6 +133,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -145,6 +151,7 @@ public enum StatusEnum { @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 0617b6904ea..bd4ee7e1cb1 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ReadOnlyFirst implements Serializable { @@ -23,6 +24,7 @@ public class ReadOnlyFirst implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -39,6 +41,7 @@ public class ReadOnlyFirst implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/SpecialModelName.java index 9afe1f14834..b8144314b82 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/SpecialModelName.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class SpecialModelName implements Serializable { @@ -22,6 +23,7 @@ public class SpecialModelName implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long getSpecialPropertyName() { return specialPropertyName; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Tag.java index 35c70dd8bbd..10a7ffc7c57 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/Tag.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Tag implements Serializable { @@ -23,6 +24,7 @@ public class Tag implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public class Tag implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/User.java index ad92725cb41..a86f0eae070 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/io/swagger/model/User.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class User implements Serializable { @@ -29,6 +30,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -45,6 +47,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -61,6 +64,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -77,6 +81,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -93,6 +98,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -109,6 +115,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -125,6 +132,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -142,6 +150,7 @@ public class User implements Serializable { @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java index 820bb4a2f18..6aa5fc2b980 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AdditionalPropertiesClass.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class AdditionalPropertiesClass implements Serializable { @@ -26,6 +27,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("map_property") public Map getMapProperty() { return mapProperty; } @@ -42,6 +44,7 @@ public class AdditionalPropertiesClass implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("map_of_map_property") public Map> getMapOfMapProperty() { return mapOfMapProperty; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Animal.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Animal.java index f7aef656d44..bb54e9cad22 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Animal.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Animal.java @@ -9,6 +9,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Animal implements Serializable { @@ -25,6 +26,7 @@ public class Animal implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("className") @NotNull public String getClassName() { return className; @@ -42,6 +44,7 @@ public class Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("color") public String getColor() { return color; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AnimalFarm.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AnimalFarm.java index ca03cafd3ef..f14a33d343e 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AnimalFarm.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/AnimalFarm.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class AnimalFarm extends ArrayList implements Serializable { diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java index 558c55d50e1..0be06450317 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfArrayOfNumberOnly.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfArrayOfNumberOnly implements Serializable { @@ -25,6 +26,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("ArrayArrayNumber") public List> getArrayArrayNumber() { return arrayArrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java index 780c9bf0df8..c131d2c633a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayOfNumberOnly.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayOfNumberOnly implements Serializable { @@ -25,6 +26,7 @@ public class ArrayOfNumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("ArrayNumber") public List getArrayNumber() { return arrayNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayTest.java index f6ef76af0d6..1720cde126c 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ArrayTest.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ArrayTest implements Serializable { @@ -27,6 +28,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_of_string") public List getArrayOfString() { return arrayOfString; } @@ -43,6 +45,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_array_of_integer") public List> getArrayArrayOfInteger() { return arrayArrayOfInteger; } @@ -59,6 +62,7 @@ public class ArrayTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("array_array_of_model") public List> getArrayArrayOfModel() { return arrayArrayOfModel; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Capitalization.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Capitalization.java index 385c622b0ba..00402e4788a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Capitalization.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Capitalization.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Capitalization implements Serializable { @@ -27,6 +28,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("smallCamel") public String getSmallCamel() { return smallCamel; } @@ -43,6 +45,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("CapitalCamel") public String getCapitalCamel() { return capitalCamel; } @@ -59,6 +62,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("small_Snake") public String getSmallSnake() { return smallSnake; } @@ -75,6 +79,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("Capital_Snake") public String getCapitalSnake() { return capitalSnake; } @@ -91,6 +96,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("SCA_ETH_Flow_Points") public String getScAETHFlowPoints() { return scAETHFlowPoints; } @@ -108,6 +114,7 @@ public class Capitalization implements Serializable { @ApiModelProperty(value = "Name of the pet ") + @JsonProperty("ATT_NAME") public String getATTNAME() { return ATT_NAME; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Cat.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Cat.java index f334fcd1914..086c6462d8e 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Cat.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Cat.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Cat extends Animal implements Serializable { @@ -23,6 +24,7 @@ public class Cat extends Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("declawed") public Boolean isDeclawed() { return declawed; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Category.java index 5cee21d0404..1e5c20bf730 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Category.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Category.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Category implements Serializable { @@ -23,6 +24,7 @@ public class Category implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public class Category implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ClassModel.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ClassModel.java index faa4cf796cb..c05c7b4a9b6 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ClassModel.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ClassModel.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model with \"_class\" property") public class ClassModel implements Serializable { @@ -26,6 +27,7 @@ public class ClassModel implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("_class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Client.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Client.java index 55a8b4e31c0..61c2aef0512 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Client.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Client.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Client implements Serializable { @@ -22,6 +23,7 @@ public class Client implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("client") public String getClient() { return client; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Dog.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Dog.java index e55012815c2..8c1d2c3f85b 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Dog.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Dog.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Dog extends Animal implements Serializable { @@ -23,6 +24,7 @@ public class Dog extends Animal implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("breed") public String getBreed() { return breed; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumArrays.java index afb80283457..595f687217d 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumArrays.java @@ -9,6 +9,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumArrays implements Serializable { @@ -87,6 +88,7 @@ public enum ArrayEnumEnum { @ApiModelProperty(value = "") + @JsonProperty("just_symbol") public JustSymbolEnum getJustSymbol() { return justSymbol; } @@ -103,6 +105,7 @@ public enum ArrayEnumEnum { @ApiModelProperty(value = "") + @JsonProperty("array_enum") public List getArrayEnum() { return arrayEnum; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumTest.java index 277fcf88e8d..d704287dd95 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/EnumTest.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class EnumTest implements Serializable { @@ -119,6 +120,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_string") public EnumStringEnum getEnumString() { return enumString; } @@ -135,6 +137,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_integer") public EnumIntegerEnum getEnumInteger() { return enumInteger; } @@ -151,6 +154,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("enum_number") public EnumNumberEnum getEnumNumber() { return enumNumber; } @@ -167,6 +171,7 @@ public enum EnumNumberEnum { @ApiModelProperty(value = "") + @JsonProperty("outerEnum") public OuterEnum getOuterEnum() { return outerEnum; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java index 64d0e10f9a1..bb3072fe1e9 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/FormatTest.java @@ -11,6 +11,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class FormatTest implements Serializable { @@ -40,6 +41,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("integer") @Min(10) @Max(100) public Integer getInteger() { return integer; } @@ -58,6 +60,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("int32") @Min(20) @Max(200) public Integer getInt32() { return int32; } @@ -74,6 +77,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("int64") public Long getInt64() { return int64; } @@ -92,6 +96,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("number") @NotNull @DecimalMin("32.1") @DecimalMax("543.2") public BigDecimal getNumber() { return number; @@ -111,6 +116,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("float") @DecimalMin("54.3") @DecimalMax("987.6") public Float getFloat() { return _float; } @@ -129,6 +135,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("double") @DecimalMin("67.8") @DecimalMax("123.4") public Double getDouble() { return _double; } @@ -145,6 +152,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("string") @Pattern(regexp="/[a-z]/i") public String getString() { return string; } @@ -161,6 +169,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @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; @@ -178,6 +187,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("binary") public byte[] getBinary() { return binary; } @@ -194,6 +204,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("date") @NotNull public LocalDate getDate() { return date; @@ -211,6 +222,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -227,6 +239,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -243,6 +256,7 @@ public class FormatTest implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("password") @NotNull @Size(min=10,max=64) public String getPassword() { return password; diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/HasOnlyReadOnly.java index bef66ba21ee..ef9c2728846 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/HasOnlyReadOnly.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class HasOnlyReadOnly implements Serializable { @@ -23,6 +24,7 @@ public class HasOnlyReadOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -39,6 +41,7 @@ public class HasOnlyReadOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("foo") public String getFoo() { return foo; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MapTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MapTest.java index ff256f599d4..54abae05490 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MapTest.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MapTest.java @@ -10,6 +10,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class MapTest implements Serializable { @@ -57,6 +58,7 @@ public enum InnerEnum { @ApiModelProperty(value = "") + @JsonProperty("map_map_of_string") public Map> getMapMapOfString() { return mapMapOfString; } @@ -73,6 +75,7 @@ public enum InnerEnum { @ApiModelProperty(value = "") + @JsonProperty("map_of_enum_string") public Map getMapOfEnumString() { return mapOfEnumString; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java index d72ca2af084..673adda125e 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -13,6 +13,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class MixedPropertiesAndAdditionalPropertiesClass implements Serializable { @@ -30,6 +31,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("uuid") public UUID getUuid() { return uuid; } @@ -46,6 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("dateTime") public Date getDateTime() { return dateTime; } @@ -62,6 +65,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl @ApiModelProperty(value = "") + @JsonProperty("map") public Map getMap() { return map; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Model200Response.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Model200Response.java index aedda176fb2..eeb8e7547cf 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Model200Response.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Model200Response.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name starting with number") public class Model200Response implements Serializable { @@ -27,6 +28,7 @@ public class Model200Response implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public Integer getName() { return name; } @@ -43,6 +45,7 @@ public class Model200Response implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("class") public String getPropertyClass() { return propertyClass; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelApiResponse.java index da860040d95..e97b1fdfd8b 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelApiResponse.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelApiResponse.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ModelApiResponse implements Serializable { @@ -24,6 +25,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("code") public Integer getCode() { return code; } @@ -40,6 +42,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("type") public String getType() { return type; } @@ -56,6 +59,7 @@ public class ModelApiResponse implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("message") public String getMessage() { return message; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelReturn.java index 1e17a101c64..72a677f7ab0 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelReturn.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ModelReturn.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing reserved words") public class ModelReturn implements Serializable { @@ -26,6 +27,7 @@ public class ModelReturn implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("return") public Integer getReturn() { return _return; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Name.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Name.java index 1c189b6e01d..5460ff8a9b9 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Name.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Name.java @@ -11,6 +11,7 @@ import javax.validation.Valid; **/ import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; @ApiModel(description = "Model for testing model name same as property name") public class Name implements Serializable { @@ -29,6 +30,7 @@ public class Name implements Serializable { @ApiModelProperty(required = true, value = "") + @JsonProperty("name") @NotNull public Integer getName() { return name; @@ -46,6 +48,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("snake_case") public Integer getSnakeCase() { return snakeCase; } @@ -62,6 +65,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("property") public String getProperty() { return property; } @@ -78,6 +82,7 @@ public class Name implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("123Number") public Integer get123Number() { return _123Number; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/NumberOnly.java index edff615a50d..5f02fd0649a 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/NumberOnly.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/NumberOnly.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class NumberOnly implements Serializable { @@ -23,6 +24,7 @@ public class NumberOnly implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("JustNumber") public BigDecimal getJustNumber() { return justNumber; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Order.java index d7042477807..f7665f15a54 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Order.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Order.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Order implements Serializable { @@ -59,6 +60,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -75,6 +77,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("petId") public Long getPetId() { return petId; } @@ -91,6 +94,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("quantity") public Integer getQuantity() { return quantity; } @@ -107,6 +111,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("shipDate") public Date getShipDate() { return shipDate; } @@ -124,6 +129,7 @@ public enum StatusEnum { @ApiModelProperty(value = "Order Status") + @JsonProperty("status") public StatusEnum getStatus() { return status; } @@ -140,6 +146,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("complete") public Boolean isComplete() { return complete; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterComposite.java index c038e105892..bfe8211b654 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterComposite.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/OuterComposite.java @@ -8,6 +8,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class OuterComposite implements Serializable { @@ -25,6 +26,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_number") public BigDecimal getMyNumber() { return myNumber; } @@ -41,6 +43,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_string") public String getMyString() { return myString; } @@ -57,6 +60,7 @@ public class OuterComposite implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("my_boolean") public Boolean getMyBoolean() { return myBoolean; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Pet.java index 5bad5ba12d6..fc8a6796b79 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Pet.java @@ -11,6 +11,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Pet implements Serializable { @@ -62,6 +63,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -78,6 +80,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("category") public Category getCategory() { return category; } @@ -94,6 +97,7 @@ public enum StatusEnum { @ApiModelProperty(example = "doggie", required = true, value = "") + @JsonProperty("name") @NotNull public String getName() { return name; @@ -111,6 +115,7 @@ public enum StatusEnum { @ApiModelProperty(required = true, value = "") + @JsonProperty("photoUrls") @NotNull public List getPhotoUrls() { return photoUrls; @@ -128,6 +133,7 @@ public enum StatusEnum { @ApiModelProperty(value = "") + @JsonProperty("tags") public List getTags() { return tags; } @@ -145,6 +151,7 @@ public enum StatusEnum { @ApiModelProperty(value = "pet status in the store") + @JsonProperty("status") public StatusEnum getStatus() { return status; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ReadOnlyFirst.java index 0617b6904ea..bd4ee7e1cb1 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ReadOnlyFirst.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/ReadOnlyFirst.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class ReadOnlyFirst implements Serializable { @@ -23,6 +24,7 @@ public class ReadOnlyFirst implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("bar") public String getBar() { return bar; } @@ -39,6 +41,7 @@ public class ReadOnlyFirst implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("baz") public String getBaz() { return baz; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/SpecialModelName.java index 9afe1f14834..b8144314b82 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/SpecialModelName.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/SpecialModelName.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class SpecialModelName implements Serializable { @@ -22,6 +23,7 @@ public class SpecialModelName implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("$special[property.name]") public Long getSpecialPropertyName() { return specialPropertyName; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Tag.java index 35c70dd8bbd..10a7ffc7c57 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Tag.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/Tag.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class Tag implements Serializable { @@ -23,6 +24,7 @@ public class Tag implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -39,6 +41,7 @@ public class Tag implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("name") public String getName() { return name; } diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/User.java index ad92725cb41..a86f0eae070 100644 --- a/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/User.java +++ b/samples/server/petstore/jaxrs-spec/src/gen/java/io/swagger/model/User.java @@ -7,6 +7,7 @@ import javax.validation.Valid; import io.swagger.annotations.*; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; public class User implements Serializable { @@ -29,6 +30,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("id") public Long getId() { return id; } @@ -45,6 +47,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("username") public String getUsername() { return username; } @@ -61,6 +64,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("firstName") public String getFirstName() { return firstName; } @@ -77,6 +81,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("lastName") public String getLastName() { return lastName; } @@ -93,6 +98,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("email") public String getEmail() { return email; } @@ -109,6 +115,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("password") public String getPassword() { return password; } @@ -125,6 +132,7 @@ public class User implements Serializable { @ApiModelProperty(value = "") + @JsonProperty("phone") public String getPhone() { return phone; } @@ -142,6 +150,7 @@ public class User implements Serializable { @ApiModelProperty(value = "User Status") + @JsonProperty("userStatus") public Integer getUserStatus() { return userStatus; }