From b404dafa02c61975794d521d40547bb99e8947a9 Mon Sep 17 00:00:00 2001 From: Gustavo Paz <32820138+gustavoapaz@users.noreply.github.com> Date: Fri, 10 Nov 2017 02:32:05 -0500 Subject: [PATCH] Issue 6694 2.3.0 (#6845) * The get method template is modified to return the value of the enum instead of the enum itself. * Update of the Petstore CXF server sample * Update of the Petstore CXF client sample * Update of the Petstore CXF server annotated base path sample * Update of the Petstore CXF server non spring application sample --- .../resources/JavaJaxRS/cxf/pojo.mustache | 13 ++++++++++-- .../src/gen/java/io/swagger/model/Order.java | 7 +++++-- .../src/gen/java/io/swagger/model/Pet.java | 7 +++++-- .../src/gen/java/io/swagger/model/Order.java | 7 +++++-- .../src/gen/java/io/swagger/model/Pet.java | 7 +++++-- .../src/gen/java/io/swagger/model/Order.java | 7 +++++-- .../src/gen/java/io/swagger/model/Pet.java | 7 +++++-- .../src/gen/java/io/swagger/api/FakeApi.java | 14 +++++++++++++ .../gen/java/io/swagger/model/EnumArrays.java | 7 +++++-- .../gen/java/io/swagger/model/EnumTest.java | 21 +++++++++++++------ .../src/gen/java/io/swagger/model/Order.java | 7 +++++-- .../src/gen/java/io/swagger/model/Pet.java | 7 +++++-- .../swagger/api/impl/FakeApiServiceImpl.java | 12 +++++++++++ 13 files changed, 97 insertions(+), 26 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache index eb53f2248cf..e59e0b9064a 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -59,9 +59,18 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { {{#vendorExtensions.extraAnnotation}} {{{vendorExtensions.extraAnnotation}}} {{/vendorExtensions.extraAnnotation}} -{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() { +{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#isEnum}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{getter}}() { + if ({{name}} == null) { + return null; + } + return {{name}}.value(); + }{{/isMapContainer}}{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{getter}}() { return {{name}}; - } + }{{/isListContainer}}{{/isEnum}}{{#isEnum}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + }{{/isMapContainer}}{{/isEnum}}{{^isEnum}}public {{{datatypeWithEnum}}} {{getter}}() { + return {{name}}; + }{{/isEnum}} {{^isReadOnly}} public void {{setter}}({{{datatypeWithEnum}}} {{name}}) { 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 4b438955a29..dac33686761 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 @@ -146,8 +146,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 826a0b31bca..3c8ab5da478 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 @@ -179,8 +179,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 4b438955a29..dac33686761 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 @@ -146,8 +146,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 826a0b31bca..3c8ab5da478 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 @@ -179,8 +179,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 4b438955a29..dac33686761 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 @@ -146,8 +146,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 826a0b31bca..3c8ab5da478 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 @@ -179,8 +179,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java index 190aceb4a5e..96c3a2b16e0 100644 --- a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/api/FakeApi.java @@ -108,6 +108,20 @@ public interface FakeApi { @ApiResponse(code = 404, message = "Not found") }) public void testEnumParameters(@Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString, @HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @Multipart(value = "enum_query_double", required = false) Double enumQueryDouble); + /** + * test inline additionalProperties + * + * + * + */ + @POST + @Path("/fake/inline-additionalProperties") + @Consumes({ "application/json" }) + @ApiOperation(value = "test inline additionalProperties", tags={ "fake", }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "successful operation") }) + public void testInlineAdditionalProperties(@Valid Object param); + /** * test json serialization of form data * 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 3af69f2f844..68193c7ada4 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 @@ -92,8 +92,11 @@ public enum ArrayEnumEnum { * @return justSymbol **/ @JsonProperty("just_symbol") - public JustSymbolEnum getJustSymbol() { - return justSymbol; + public String getJustSymbol() { + if (justSymbol == null) { + return null; + } + return justSymbol.value(); } public void setJustSymbol(JustSymbolEnum justSymbol) { diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/io/swagger/model/EnumTest.java index d573a77a98b..e4db3ed4395 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 @@ -128,8 +128,11 @@ public enum EnumNumberEnum { * @return enumString **/ @JsonProperty("enum_string") - public EnumStringEnum getEnumString() { - return enumString; + public String getEnumString() { + if (enumString == null) { + return null; + } + return enumString.value(); } public void setEnumString(EnumStringEnum enumString) { @@ -146,8 +149,11 @@ public enum EnumNumberEnum { * @return enumInteger **/ @JsonProperty("enum_integer") - public EnumIntegerEnum getEnumInteger() { - return enumInteger; + public Integer getEnumInteger() { + if (enumInteger == null) { + return null; + } + return enumInteger.value(); } public void setEnumInteger(EnumIntegerEnum enumInteger) { @@ -164,8 +170,11 @@ public enum EnumNumberEnum { * @return enumNumber **/ @JsonProperty("enum_number") - public EnumNumberEnum getEnumNumber() { - return enumNumber; + public Double getEnumNumber() { + if (enumNumber == null) { + return null; + } + return enumNumber.value(); } public void setEnumNumber(EnumNumberEnum enumNumber) { 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 985634c955d..4b5fbdf9640 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 @@ -141,8 +141,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { 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 28db37fa0b9..8cb32bc3e9c 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 @@ -174,8 +174,11 @@ public enum StatusEnum { * @return status **/ @JsonProperty("status") - public StatusEnum getStatus() { - return status; + public String getStatus() { + if (status == null) { + return null; + } + return status.value(); } public void setStatus(StatusEnum status) { diff --git a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java index 5e47422edf4..9f0c36bd52d 100644 --- a/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-cxf/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java @@ -85,6 +85,18 @@ public class FakeApiServiceImpl implements FakeApi { // TODO: Implement... + } + + /** + * test inline additionalProperties + * + * + * + */ + public void testInlineAdditionalProperties(Object param) { + // TODO: Implement... + + } /**