From d9b6600e81baf1e64b7666b62afc9f6806330f79 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 15:35:10 +0200 Subject: [PATCH 01/35] [JavaJaxRs] enumClass.mustache added getValue() JavaJaxRs enums are missing getValue() method returning the correct data type. --- .../src/main/resources/JavaJaxRS/enumClass.mustache | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache index 018fae75452c..e628240de9cb 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache @@ -36,8 +36,12 @@ this.value = value; } - @Override @JsonValue + public {{{dataType}}} getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 1ea0273e0b5821d3b0ae07dfed6bb5bf6b8f7dec Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 15:48:26 +0200 Subject: [PATCH 02/35] Update InlineObject2.java added getValue() for enums --- .../java/org/openapitools/model/InlineObject2.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java index 494911bcf5e6..49392d7c9835 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/InlineObject2.java @@ -48,8 +48,12 @@ public enum EnumFormStringArrayEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -85,8 +89,12 @@ public enum EnumFormStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 56112d3c2002b314f6bd60f1745adc9e5f363601 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:07:47 +0200 Subject: [PATCH 03/35] Update Pet.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Pet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java index c98bb3ed66eb..b9db895ac9c7 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java @@ -80,8 +80,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 65dd0487976ddfb083ec8335375edcc95ba7eebb Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:27:01 +0200 Subject: [PATCH 04/35] Update BigCat.java added getValue for enum --- .../src/gen/java/org/openapitools/model/BigCat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java index 492bd7c041bc..0b00e0935bb2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java @@ -51,8 +51,12 @@ public enum KindEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From da2692310091543aad53dcec635c462df2502ddc Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:27:55 +0200 Subject: [PATCH 05/35] Update EnumArrays.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/EnumArrays.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java index 8f8efe7c2bac..730559153e25 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java @@ -50,8 +50,12 @@ public enum JustSymbolEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From f2c3f66db683c93881cee983d50f110f488998eb Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:29:38 +0200 Subject: [PATCH 06/35] Update EnumArrays.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/EnumArrays.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java index 730559153e25..98ac384b7cb3 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java @@ -89,8 +89,12 @@ public enum ArrayEnumEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From d66cad7d6997fafbccbc53d7d3248cbee8043344 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:33:50 +0200 Subject: [PATCH 07/35] Update EnumTest.java added getValue() to enums --- .../java/org/openapitools/model/EnumTest.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java index 713f9ec00077..51da878b77d8 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java @@ -54,8 +54,12 @@ public enum EnumStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -91,8 +95,12 @@ public enum EnumStringRequiredEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -126,8 +134,12 @@ public enum EnumIntegerEnum { this.value = value; } - @Override @JsonValue + public Integer getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -161,8 +173,12 @@ public enum EnumNumberEnum { this.value = value; } - @Override @JsonValue + public Double getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 88d3c9f2e986b84ca9dfa2b10513e32abd93fe89 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:35:53 +0200 Subject: [PATCH 08/35] Update MapTest.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/MapTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java index bcf820cb2aa6..2433515aaa06 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java @@ -55,8 +55,12 @@ public enum InnerEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From e4659a30f5e0f052abad341c144da2f5831f32ae Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:37:03 +0200 Subject: [PATCH 09/35] Update Order.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Order.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java index 109cb7b25929..c042bb9e30e2 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java @@ -70,8 +70,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 3319b922577afbf30faa11e7b260ffc783f19fae Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:38:24 +0200 Subject: [PATCH 10/35] Update Pet.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Pet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java index 6ba4c7bf2ee0..2c972e157158 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java @@ -81,8 +81,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From aaea780fa94e1f15be7febd9fdbfe4e98d9a517b Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:42:24 +0200 Subject: [PATCH 11/35] Update EnumArrays.java added getValue() to enums --- .../gen/java/org/openapitools/model/EnumArrays.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java index d52834b9f589..758cbd144bff 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java @@ -49,8 +49,12 @@ public enum JustSymbolEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -84,8 +88,12 @@ public enum ArrayEnumEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 5701947f33e2c4ba5ebe6572875cc29ce92f522a Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:44:49 +0200 Subject: [PATCH 12/35] Update EnumTest.java added getValue() to enums --- .../java/org/openapitools/model/EnumTest.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java index 6d386104b342..9bba0e2df99c 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java @@ -59,8 +59,12 @@ public enum EnumStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -96,8 +100,12 @@ public enum EnumStringRequiredEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -131,8 +139,12 @@ public enum EnumIntegerEnum { this.value = value; } - @Override @JsonValue + public Integer getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -166,8 +178,12 @@ public enum EnumNumberEnum { this.value = value; } - @Override @JsonValue + public Double getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 134d5642bd09937ce18a89d383efce0460ff26fe Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:46:06 +0200 Subject: [PATCH 13/35] Update MapTest.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/MapTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java index def1e083923d..b536bd8a8506 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java @@ -54,8 +54,12 @@ public enum InnerEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From d6355af96c76f2a6ce5222f750d3ef66a8ab0175 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:47:00 +0200 Subject: [PATCH 14/35] Update Order.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Order.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java index 2c5f67442915..f876902045ff 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java @@ -69,8 +69,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From ce237e15844fcf3c9a2be35f48ba29b9c8a3e462 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:48:31 +0200 Subject: [PATCH 15/35] Update ParentWithNullable.java added getValue() to enum --- .../gen/java/org/openapitools/model/ParentWithNullable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ParentWithNullable.java index 9626ef80c9da..e83ca22e33f1 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -51,8 +51,12 @@ public enum TypeEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 5a9672c93886ee1cf9fceee23b6fc3d87c47b42f Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:50:39 +0200 Subject: [PATCH 16/35] Update BigCat.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/BigCat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java index 8eb044c9bdf0..30deccfab1e0 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/BigCat.java @@ -50,8 +50,12 @@ public enum KindEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From fd47921d4a354bc4f72dddb129a6ff705f5af03f Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:51:46 +0200 Subject: [PATCH 17/35] Update EnumArrays.java added getValue() to enums --- .../gen/java/org/openapitools/model/EnumArrays.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java index d52834b9f589..758cbd144bff 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumArrays.java @@ -49,8 +49,12 @@ public enum JustSymbolEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -84,8 +88,12 @@ public enum ArrayEnumEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From cbe1c925f9f8cb9d08da71a0369c6c03b65cd372 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:53:37 +0200 Subject: [PATCH 18/35] Update EnumTest.java added getValue() to enums --- .../java/org/openapitools/model/EnumTest.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 24244632f128..6e1604772ebe 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -53,8 +53,12 @@ public enum EnumStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -90,8 +94,12 @@ public enum EnumStringRequiredEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -125,9 +133,13 @@ public enum EnumIntegerEnum { this.value = value; } - @Override @JsonValue - public String toString() { + public String getValue() { + return value; + } + + @Override + public Integer toString() { return String.valueOf(value); } @@ -160,8 +172,12 @@ public enum EnumNumberEnum { this.value = value; } - @Override @JsonValue + public Double getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 5219cfc984b2075d28f0994d4f34fcf8c7d0e65c Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:54:50 +0200 Subject: [PATCH 19/35] Update MapTest.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/MapTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java index def1e083923d..b536bd8a8506 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MapTest.java @@ -54,8 +54,12 @@ public enum InnerEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 0fe52c20e76bcad2a9e9afb75fdae0f35606f7ca Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:55:24 +0200 Subject: [PATCH 20/35] Update Order.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Order.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java index 2c5f67442915..f876902045ff 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Order.java @@ -69,8 +69,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 8917350b3486f18a1950243b612bbbdea779e1e7 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:56:18 +0200 Subject: [PATCH 21/35] Update Pet.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/Pet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java index c98bb3ed66eb..b9db895ac9c7 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/Pet.java @@ -80,8 +80,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 78420dba7fcea0a2327dd691f75e4dfebf111b46 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:57:19 +0200 Subject: [PATCH 22/35] Update BigCat.java added getValue() to enum --- .../jersey2/src/gen/java/org/openapitools/model/BigCat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java index 8eb044c9bdf0..30deccfab1e0 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/BigCat.java @@ -50,8 +50,12 @@ public enum KindEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From c760807385592d3a0ccfbc86d31b79686f7ea939 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:58:13 +0200 Subject: [PATCH 23/35] Update EnumArrays.java added getValue() to enums --- .../gen/java/org/openapitools/model/EnumArrays.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java index d52834b9f589..758cbd144bff 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumArrays.java @@ -49,8 +49,12 @@ public enum JustSymbolEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -84,8 +88,12 @@ public enum ArrayEnumEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From fd39e44345aef0a671dee8355a825a01f04c1648 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:59:44 +0200 Subject: [PATCH 24/35] Update EnumTest.java added getValue() to enums --- .../java/org/openapitools/model/EnumTest.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java index 24244632f128..16aa98e4f1f5 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumTest.java @@ -53,8 +53,12 @@ public enum EnumStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -90,8 +94,12 @@ public enum EnumStringRequiredEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -125,8 +133,12 @@ public enum EnumIntegerEnum { this.value = value; } - @Override @JsonValue + public Integer getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -160,8 +172,12 @@ public enum EnumNumberEnum { this.value = value; } - @Override @JsonValue + public Double getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From b09262bc14ddfdf906fea93d03f629dbb6148f93 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:00:50 +0200 Subject: [PATCH 25/35] Update MapTest.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/MapTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java index def1e083923d..b536bd8a8506 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MapTest.java @@ -54,8 +54,12 @@ public enum InnerEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 70b6da1c8523b739e05e5bd4695383613d144ba6 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:01:32 +0200 Subject: [PATCH 26/35] Update Order.java added getValue() to enum --- .../jersey2/src/gen/java/org/openapitools/model/Order.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java index 2c5f67442915..f876902045ff 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Order.java @@ -69,8 +69,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 8500dff86844bd71d1391dcefd0ffba5c9ae53a6 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:02:14 +0200 Subject: [PATCH 27/35] Update Pet.java added getValue to enum --- .../jersey2/src/gen/java/org/openapitools/model/Pet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java index c98bb3ed66eb..b9db895ac9c7 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/Pet.java @@ -80,8 +80,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 89a0745d23c2ebeaf961a6fd7eefbaf108560ca9 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:04:09 +0200 Subject: [PATCH 28/35] Update EnumArrays.java added getValue() to enum --- .../gen/java/org/openapitools/model/EnumArrays.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumArrays.java index 52fd82557dd6..82ac5d85c527 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumArrays.java @@ -48,8 +48,12 @@ public enum JustSymbolEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -83,8 +87,12 @@ public enum ArrayEnumEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 4a3f2dba8dcc1f74eb8efa312bcc4d249aa34c7e Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:05:43 +0200 Subject: [PATCH 29/35] Update EnumTest.java added getValue() to enums --- .../java/org/openapitools/model/EnumTest.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumTest.java index 09981cb6b9ae..f9e4f480a5b6 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumTest.java @@ -58,8 +58,12 @@ public enum EnumStringEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -95,8 +99,12 @@ public enum EnumStringRequiredEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -130,8 +138,12 @@ public enum EnumIntegerEnum { this.value = value; } - @Override @JsonValue + public Integer getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } @@ -165,8 +177,12 @@ public enum EnumNumberEnum { this.value = value; } - @Override @JsonValue + public Double getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From d6dfbfc1a0fdf466a357e9622175c5d3301dfa70 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:06:54 +0200 Subject: [PATCH 30/35] Update MapTest.java added getValue() to enum --- .../src/gen/java/org/openapitools/model/MapTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MapTest.java index eb78fe2a3b33..fda2605526d9 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MapTest.java @@ -53,8 +53,12 @@ public enum InnerEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 9fc2ab48328fcbbc2819c2e2a8ef18f9a2064290 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:07:31 +0200 Subject: [PATCH 31/35] Update Order.java added getValue() to enum --- .../jersey3/src/gen/java/org/openapitools/model/Order.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java index f0ce71ce7b98..5c96be8e0b05 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java @@ -68,8 +68,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From f260c71251781d2bc7a171ebc2df9afa36738e73 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:08:24 +0200 Subject: [PATCH 32/35] Update ParentWithNullable.java added getValue() to enum --- .../gen/java/org/openapitools/model/ParentWithNullable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ParentWithNullable.java index c8a915cb0812..602f223725cc 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ParentWithNullable.java @@ -50,8 +50,12 @@ public enum TypeEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 9f19b33e167c0e423d2612dd22e0be0774f2b14e Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Tue, 29 Apr 2025 17:09:05 +0200 Subject: [PATCH 33/35] Update Pet.java added getValue() to enum --- .../jersey3/src/gen/java/org/openapitools/model/Pet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java index e32b42e939ca..e3eca834ca5f 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Pet.java @@ -79,8 +79,12 @@ public enum StatusEnum { this.value = value; } - @Override @JsonValue + public String getValue() { + return value; + } + + @Override public String toString() { return String.valueOf(value); } From 3177e8b1632e23ce12762e91695a5f557537cefd Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Wed, 30 Apr 2025 08:23:33 +0200 Subject: [PATCH 34/35] Update EnumTest.java getValue() with Integer --- .../src/gen/java/org/openapitools/model/EnumTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 6e1604772ebe..20d71f4af56c 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -134,7 +134,7 @@ public enum EnumIntegerEnum { } @JsonValue - public String getValue() { + public Integer getValue() { return value; } From f15ae4e90ebcc85f571482829da6010daf712cb3 Mon Sep 17 00:00:00 2001 From: Eric Rolli <149762070+eric-rolli@users.noreply.github.com> Date: Wed, 30 Apr 2025 08:24:26 +0200 Subject: [PATCH 35/35] Update EnumTest.java --- .../src/gen/java/org/openapitools/model/EnumTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java index 20d71f4af56c..16aa98e4f1f5 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumTest.java @@ -139,7 +139,7 @@ public Integer getValue() { } @Override - public Integer toString() { + public String toString() { return String.valueOf(value); }