From ecbbccb37a3473e27eaaf2b91e8eb99860baca02 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Sun, 9 Nov 2025 17:55:22 +0100 Subject: [PATCH 1/9] [Java] Annotate Deprecated `enum`-classes with `@Deprecated` --- .../src/main/resources/Java/modelEnum.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 68fc9e089fad..8cdda8e88c7a 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -17,7 +17,8 @@ import java.util.Locale; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ -{{#gson}} +{{#isDeprecated}}@Deprecated +{{/isDeprecated}}{{#gson}} @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) {{/gson}} {{#jsonb}} From f9db653cbdf41d93338f875f882d801ec5f8c710 Mon Sep 17 00:00:00 2001 From: Christopher Molin <28791817+chrimle@users.noreply.github.com> Date: Mon, 10 Nov 2025 22:01:25 +0100 Subject: [PATCH 2/9] Update Generated 'samples'-files Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../main/java/org/openapitools/client/model/StringEnumRef.java | 1 + .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 + .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 + .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 + .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 + .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 + .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 + .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 + .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 + 9 files changed, 9 insertions(+) diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java index 3e8670e46d5f..3ab759d81dab 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -28,6 +28,7 @@ /** * Gets or Sets StringEnumRef */ + @JsonAdapter(StringEnumRef.Adapter.class) public enum StringEnumRef { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java index a876218ea629..072c51827718 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java @@ -31,6 +31,7 @@ /** * Gets or Sets EnumClass */ + @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java index e56e9d0d83d3..46f7785699ba 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -31,6 +31,7 @@ /** * Gets or Sets OuterEnum */ + @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java index 2cdf61fc6ee1..6c00712ecff2 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,6 +28,7 @@ /** * Gets or Sets EnumClass */ + @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java index 4f7b51df11a8..0c7259337809 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,6 +28,7 @@ /** * Gets or Sets OuterEnum */ + @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java index 2cdf61fc6ee1..6c00712ecff2 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,6 +28,7 @@ /** * Gets or Sets EnumClass */ + @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java index 4f7b51df11a8..0c7259337809 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,6 +28,7 @@ /** * Gets or Sets OuterEnum */ + @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java index 2cdf61fc6ee1..6c00712ecff2 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,6 +28,7 @@ /** * Gets or Sets EnumClass */ + @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java index 4f7b51df11a8..0c7259337809 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,6 +28,7 @@ /** * Gets or Sets OuterEnum */ + @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { From db8bb4f0f84daeb310f8bb4924f2b5cd9e550428 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:25:32 +0100 Subject: [PATCH 3/9] Update `modelEnum.mustache` According to Review Comment Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../src/main/resources/Java/modelEnum.mustache | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 8cdda8e88c7a..b34e73c9ba23 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -17,8 +17,10 @@ import java.util.Locale; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ -{{#isDeprecated}}@Deprecated -{{/isDeprecated}}{{#gson}} +{{#isDeprecated}} +@Deprecated +{{/isDeprecated}} +{{#gson}} @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) {{/gson}} {{#jsonb}} From 313e355d49862bcb02b2b7f9164d9e5f943a8e0a Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:31:49 +0100 Subject: [PATCH 4/9] Update Generated 'sample'-files Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../main/java/org/openapitools/client/model/StringEnumRef.java | 1 - .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 - .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 - .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 - .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 - .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 - .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 - .../src/main/java/org/openapitools/client/model/EnumClass.java | 1 - .../src/main/java/org/openapitools/client/model/OuterEnum.java | 1 - 9 files changed, 9 deletions(-) diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java index 3ab759d81dab..3e8670e46d5f 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -28,7 +28,6 @@ /** * Gets or Sets StringEnumRef */ - @JsonAdapter(StringEnumRef.Adapter.class) public enum StringEnumRef { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java index 072c51827718..a876218ea629 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java @@ -31,7 +31,6 @@ /** * Gets or Sets EnumClass */ - @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java index 46f7785699ba..e56e9d0d83d3 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -31,7 +31,6 @@ /** * Gets or Sets OuterEnum */ - @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java index 6c00712ecff2..2cdf61fc6ee1 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,7 +28,6 @@ /** * Gets or Sets EnumClass */ - @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java index 0c7259337809..4f7b51df11a8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,7 +28,6 @@ /** * Gets or Sets OuterEnum */ - @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java index 6c00712ecff2..2cdf61fc6ee1 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,7 +28,6 @@ /** * Gets or Sets EnumClass */ - @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java index 0c7259337809..4f7b51df11a8 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,7 +28,6 @@ /** * Gets or Sets OuterEnum */ - @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java index 6c00712ecff2..2cdf61fc6ee1 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java @@ -28,7 +28,6 @@ /** * Gets or Sets EnumClass */ - @JsonAdapter(EnumClass.Adapter.class) public enum EnumClass { diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java index 0c7259337809..4f7b51df11a8 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -28,7 +28,6 @@ /** * Gets or Sets OuterEnum */ - @JsonAdapter(OuterEnum.Adapter.class) public enum OuterEnum { From 8b6313ac24fcf37986cf7a1ac8d476c99fac8750 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:41:19 +0100 Subject: [PATCH 5/9] Update Java Native `modelEnum.mustache` File Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../main/resources/Java/libraries/native/modelEnum.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache index ca5adc8d3bc1..47c6b4342585 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache @@ -17,6 +17,9 @@ import java.util.Locale; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ +{{#isDeprecated}} +@Deprecated +{{/isDeprecated}} {{#gson}} @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) {{/gson}} From e911f507f27853b677fd604eae1a3d2c8b80aae2 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:41:50 +0100 Subject: [PATCH 6/9] Update Java JaxRS `modelEnum.mustache` File Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index e2b1cbaedb14..2e497f21d477 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonValue; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ +{{#isDeprecated}} +@Deprecated +{{/isDeprecated}} {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} { {{#gson}} {{#allowableValues}}{{#enumVars}} From 349a2ab7241d3c026c281b58554ccdb06999bfec Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:42:58 +0100 Subject: [PATCH 7/9] Update Java Okhttp-gson `modelEnum.mustache` File Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../resources/Java/libraries/okhttp-gson/modelEnum.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache index 9bc7bf299833..9a9f392d4544 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache @@ -12,6 +12,9 @@ import com.google.gson.stream.JsonWriter; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ +{{#isDeprecated}} +@Deprecated +{{/isDeprecated}} @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class) {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}{{#vendorExtensions.x-implements}}{{#-first}} implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} { {{#allowableValues}}{{#enumVars}} From 837ced363483e4a29f56c8967fde5b3c165dd900 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:44:55 +0100 Subject: [PATCH 8/9] Update Java Micronaut `modelEnum.mustache` File Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../resources/java-micronaut/common/model/modelEnum.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache index bb48e8062891..e81b044e97d7 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonValue; /** * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} */ +{{#isDeprecated}} +@Deprecated +{{/isDeprecated}} {{#additionalEnumTypeAnnotations}} {{{.}}} {{/additionalEnumTypeAnnotations}}{{#useBeanValidation}}@Introspected From 19269c742fd68fd6994d8385e9bb84b074530440 Mon Sep 17 00:00:00 2001 From: Chrimle <28791817+Chrimle@users.noreply.github.com> Date: Tue, 11 Nov 2025 19:46:24 +0100 Subject: [PATCH 9/9] Update Java Helidon `modelEnum.mustache` File Signed-off-by: Chrimle <28791817+Chrimle@users.noreply.github.com> --- .../java-helidon/server/libraries/mp/modelEnum.mustache | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache index 1eb5bb263c79..dc66e6ccc74b 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache @@ -1,6 +1,9 @@ /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ +{{#isDeprecated}} + @Deprecated +{{/isDeprecated}} {{#jsonb}} @JsonbTypeSerializer({{datatypeWithEnum}}.Serializer.class) @JsonbTypeDeserializer({{datatypeWithEnum}}.Deserializer.class)