From 06150767f440c016287724f98bd620862e5d88f3 Mon Sep 17 00:00:00 2001 From: David Cloutier Date: Sat, 15 Dec 2018 04:04:45 -0500 Subject: [PATCH] Proposed fix for issues #1654. fix isSerializable for java jaxrs-cxf (#1656) * Update model.mustache fix serializable import for cxf-cdi * Update pojo.mustache add implements to the pojo if isSerializable is true * Update model.mustache add import statement to fix compile issue when {{#serializableModel}} is true * Update pojo.mustache remove extra space to prevent unecessary diffs in petstore examples: diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/* --- .../src/main/resources/JavaJaxRS/cxf-cdi/model.mustache | 3 +++ .../src/main/resources/JavaJaxRS/cxf/model.mustache | 3 +++ .../src/main/resources/JavaJaxRS/cxf/pojo.mustache | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache index 8b8dab6b0db..df7d1df8d21 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache @@ -2,6 +2,9 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +{{#serializableModel}} +import java.io.Serializable; +{{/serializableModel}} {{#useBeanValidation}} import javax.validation.constraints.*; {{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache index dd069aa87b3..ee1912f51ff 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/model.mustache @@ -2,6 +2,9 @@ package {{package}}; {{#imports}}import {{import}}; {{/imports}} +{{#serializableModel}} +import java.io.Serializable; +{{/serializableModel}} {{#useBeanValidation}} import javax.validation.constraints.*; import javax.validation.Valid; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache index c6d73b3dbe8..9858f8af59b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; **/ @ApiModel(description="{{{description}}}") {{/description}} -public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} { +public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} { {{#vars}}{{#isEnum}}{{^isContainer}} {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}} {{>enumClass}}{{/mostInnerItems}}{{/isContainer}}{{/isEnum}}