From df8137cf2195da3246ae3522085a15fd77e3d7df Mon Sep 17 00:00:00 2001 From: Dec12 | Fujigon Date: Wed, 16 Jan 2019 11:29:31 +0900 Subject: [PATCH] [JAVA][JAX-RS] don't forget to support @JsonValue for enum (#1833) * don't forget to support JsonValue * re-generate samples --- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 8 ++++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ .../src/gen/java/org/openapitools/model/EnumClass.java | 6 ++++++ .../src/gen/java/org/openapitools/model/OuterEnum.java | 6 ++++++ 13 files changed, 80 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 1063f334a51..f31d2dbdf1a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -1,5 +1,6 @@ {{#jackson}} import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; {{/jackson}} /** @@ -24,6 +25,13 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum this.value = value; } +{{#jackson}} + @JsonValue +{{/jackson}} + public {{{dataType}}} getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java index ee069ce6527..7eeba710bc9 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java @@ -20,6 +20,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -38,6 +39,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java index 9e030ddb990..95b0a1f9d03 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java @@ -20,6 +20,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -38,6 +39,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java index de61df4076b..04db2513c30 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -37,6 +38,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java index 3c15248e185..00d94aa0ef0 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -37,6 +38,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumClass.java index de61df4076b..04db2513c30 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/EnumClass.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -37,6 +38,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterEnum.java index 3c15248e185..00d94aa0ef0 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/OuterEnum.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -37,6 +38,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumClass.java index de61df4076b..04db2513c30 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/EnumClass.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -37,6 +38,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterEnum.java index 3c15248e185..00d94aa0ef0 100644 --- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/OuterEnum.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -37,6 +38,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java index de61df4076b..04db2513c30 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -37,6 +38,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java index 3c15248e185..00d94aa0ef0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -37,6 +38,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java index de61df4076b..04db2513c30 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets EnumClass @@ -37,6 +38,11 @@ public enum EnumClass { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value); diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java index 3c15248e185..00d94aa0ef0 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java @@ -19,6 +19,7 @@ import javax.validation.constraints.*; import javax.validation.Valid; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; /** * Gets or Sets OuterEnum @@ -37,6 +38,11 @@ public enum OuterEnum { this.value = value; } + @JsonValue + public String getValue() { + return value; + } + @Override public String toString() { return String.valueOf(value);