From 0d6669ed2965419cd3c162600a045236723acb8e Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Wed, 11 Dec 2024 13:53:38 +0100
Subject: [PATCH 01/22] bugfix-20188: use numeric check to ensure that
 generated inner enums do not use valueOf factory method for BigDecimals.

---
 .../src/main/resources/Java/modelInnerEnum.mustache  |  2 +-
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------
 .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------
 .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java |  8 ++++----
 .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------
 28 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
index 401002a697b3..c8cc050cb155 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
@@ -23,7 +23,7 @@
     {{#withXml}}
     @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
     {{/withXml}}
-    {{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
+    {{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
index dd6b2b1120c4..050658e53425 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -136,9 +136,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -175,9 +175,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
index 2d59b570c68f..f4d877dc5255 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -128,9 +128,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -167,9 +167,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index 309485f05380..a5ac61e6eba4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 186711eee427..8d790ad53602 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -123,9 +123,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -162,9 +162,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
index e73d5e649885..9b36551975d5 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index e73d5e649885..9b36551975d5 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
index 7c328fdc279e..56bc53f38932 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumIntegerOnly
    */
   public enum EnumIntegerOnlyEnum {
-    NUMBER_2(Integer.valueOf(2)),
+    NUMBER_2(2),
     
-    NUMBER_MINUS_2(Integer.valueOf(-2));
+    NUMBER_MINUS_2(-2);
 
     private Integer value;
 
@@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
index 026e11f6a995..87beed7abe72 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -139,9 +139,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -178,9 +178,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumIntegerOnly
    */
   public enum EnumIntegerOnlyEnum {
-    NUMBER_2(Integer.valueOf(2)),
+    NUMBER_2(2),
     
-    NUMBER_MINUS_2(Integer.valueOf(-2));
+    NUMBER_MINUS_2(-2);
 
     private Integer value;
 
@@ -217,9 +217,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
index 5ddcc71f7b03..fa4401baa56f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumIntegerOnly
    */
   public enum EnumIntegerOnlyEnum {
-    NUMBER_2(Integer.valueOf(2)),
+    NUMBER_2(2),
     
-    NUMBER_MINUS_2(Integer.valueOf(-2));
+    NUMBER_MINUS_2(-2);
 
     private Integer value;
 
@@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index 9dc9586d749e..00753d37230b 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
index aa61d1339f52..68cd1ff6ef5e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -144,9 +144,9 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
    */
   @JsonAdapter(EnumIntegerEnum.Adapter.class)
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -196,9 +196,9 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
    */
   @JsonAdapter(EnumNumberEnum.Adapter.class)
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
index d050e97f6f68..9c2da069a03a 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -134,9 +134,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -173,9 +173,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
index 0eb8cdd88ed5..f8139e3d3a13 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
index 0eb8cdd88ed5..f8139e3d3a13 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
index fbd92e259a57..44538cb58284 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
index d37c9b5101be..6669204c9ddd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -155,10 +155,10 @@ public static EnumStringRequiredEnum fromValue(String value) {
   @XmlEnum(Integer.class)
   public enum EnumIntegerEnum {
     @XmlEnumValue("1")
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
     @XmlEnumValue("-1")
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -199,10 +199,10 @@ public static EnumIntegerEnum fromValue(Integer value) {
   @XmlEnum(Double.class)
   public enum EnumNumberEnum {
     @XmlEnumValue("1.1")
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
     @XmlEnumValue("-1.2")
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index 7f4bf5632fe7..edee5ad5958c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
index ae5a957c9847..f6bf5f157ee6 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -125,9 +125,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -164,9 +164,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
index ee82acebcba4..ce280e6a3a9b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -141,9 +141,9 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
    */
   @JsonAdapter(EnumIntegerEnum.Adapter.class)
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -193,9 +193,9 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
    */
   @JsonAdapter(EnumNumberEnum.Adapter.class)
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
index ee82acebcba4..ce280e6a3a9b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -141,9 +141,9 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
    */
   @JsonAdapter(EnumIntegerEnum.Adapter.class)
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -193,9 +193,9 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
    */
   @JsonAdapter(EnumNumberEnum.Adapter.class)
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
index ee82acebcba4..ce280e6a3a9b 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -141,9 +141,9 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
    */
   @JsonAdapter(EnumIntegerEnum.Adapter.class)
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -193,9 +193,9 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
    */
   @JsonAdapter(EnumNumberEnum.Adapter.class)
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
index 186711eee427..8d790ad53602 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -123,9 +123,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -162,9 +162,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
index fbd92e259a57..44538cb58284 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
index 0eb8cdd88ed5..f8139e3d3a13 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
index b6be036040ef..9e009ba77f1d 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -134,9 +134,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -173,9 +173,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
index 88f0ea9a8fd4..6a4ecf6393ff 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index c5669e796188..2b6e48f5dec8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -139,9 +139,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -178,9 +178,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumIntegerOnly
    */
   public enum EnumIntegerOnlyEnum {
-    NUMBER_2(Integer.valueOf(2)),
+    NUMBER_2(2),
     
-    NUMBER_MINUS_2(Integer.valueOf(-2));
+    NUMBER_MINUS_2(-2);
 
     private Integer value;
 
@@ -217,9 +217,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 

From 833d716f7f7812040384401b23287c26bd4d9059 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 17 Dec 2024 09:34:48 +0100
Subject: [PATCH 02/22] bugfix-20188: Add test data to fake Api in
 petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml

---
 ...points-models-for-testing-okhttp-gson.yaml | 29 +++++++++++++++++++
 .../java/okhttp-gson/api/openapi.yaml         | 29 +++++++++++++++++++
 .../AllOfModelArrayAnyOfAllOfAttributesC.md   | 10 +++++++
 .../petstore/java/okhttp-gson/docs/FakeApi.md |  8 +++--
 .../petstore/java/okhttp-gson/docs/Order.md   | 10 +++++++
 .../AllOfModelArrayAnyOfAllOfAttributesC.java |  1 +
 6 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
index 3d6fb0e9be22..fcac5b53b58a 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
@@ -681,6 +681,23 @@ paths:
                     - '-efg'
                     - (xyz)
                   default: '-efg'
+                enum_form_integer:
+                  description: Form parameter enum test (integer)
+                  type: integer
+                  enum:
+                    - 1
+                    - -1
+                    - 0
+                  default: 1
+                enum_form_double:
+                  description: Form parameter enum test (double)
+                  type: double
+                  enum:
+                    - 1.1
+                    - -1.1
+                    - 0.1
+                    - 0.0
+                  default: 1.1
     post:
       tags:
         - fake
@@ -1558,6 +1575,18 @@ components:
         complete:
           type: boolean
           default: false
+        paymentMethod:
+          type: number
+          format: int32
+          description: "Various payment methods"
+          default: 1
+          example: 1
+          x-enum-description:
+            - Paypal
+            - Creditcard
+          enum:
+            - 1
+            - 2
       xml:
         name: Order
     Category:
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index 84cc46562f5a..315eea630b6a 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -1613,6 +1613,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2020-02-02T20:20:20.000222Z
         complete: false
@@ -1641,6 +1642,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2963,6 +2976,22 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: double
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md b/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md
index 5229de89b299..f94d7753cfb0 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md
@@ -17,6 +17,7 @@
 |**quantity** | **Integer** |  |  [optional] |
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -30,3 +31,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index eb2f76491a83..b031ec7edd76 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -982,7 +982,7 @@ null (empty response body)
 
 <a id="testEnumParameters"></a>
 # **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1011,8 +1011,10 @@ public class Example {
     Double enumQueryDouble = 1.1D; // Double | Query parameter enum test (double)
     List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
     String enumFormString = "_abc"; // String | Form parameter enum test (string)
+    Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+    Double enumFormDouble = 1.1D; // Double | Form parameter enum test (double)
     try {
-      apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+      apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     } catch (ApiException e) {
       System.err.println("Exception when calling FakeApi#testEnumParameters");
       System.err.println("Status code: " + e.getCode());
@@ -1036,6 +1038,8 @@ public class Example {
 | **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | [**Double**](Double.md)| Form parameter enum test (double) | [optional] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Order.md b/samples/client/petstore/java/okhttp-gson/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java
index 72e35c27ef99..61ef046eb142 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java
@@ -20,6 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;

From 56cda0ad7d8ebf83004605480567387526f97c28 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 8 Apr 2025 12:54:27 +0200
Subject: [PATCH 03/22] Generate samples

---
 .../org/openapitools/client/api/FakeApi.java  | 34 ++++++++++++++-----
 .../openapitools/client/model/EnumTest.java   |  8 ++---
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
index 7055253c1a0b..63a6d4b47df3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -2108,6 +2108,8 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
      * @param enumQueryDouble Query parameter enum test (double) (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional)
      * @param _callback Callback for upload/download progress
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
@@ -2119,7 +2121,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -2152,6 +2154,14 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<Strin
             localVarFormParams.put("enum_form_string", enumFormString);
         }
 
+        if (enumFormInteger != null) {
+            localVarFormParams.put("enum_form_integer", enumFormInteger);
+        }
+
+        if (enumFormDouble != null) {
+            localVarFormParams.put("enum_form_double", enumFormDouble);
+        }
+
         if (enumQueryStringArray != null) {
             localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray));
         }
@@ -2198,8 +2208,8 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<Strin
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback _callback) throws ApiException {
-        return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, _callback);
+    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback _callback) throws ApiException {
+        return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
 
     }
 
@@ -2214,6 +2224,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
      * @param enumQueryDouble Query parameter enum test (double) (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table border="1">
@@ -2223,8 +2235,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException {
-        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble) throws ApiException {
+        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
@@ -2238,6 +2250,8 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
      * @param enumQueryDouble Query parameter enum test (double) (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional)
      * @return ApiResponse&lt;Void&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
@@ -2248,8 +2262,8 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException {
-        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, null);
+    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble) throws ApiException {
+        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null);
         return localVarApiClient.execute(localVarCall);
     }
 
@@ -2264,6 +2278,8 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
      * @param enumQueryDouble Query parameter enum test (double) (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -2275,9 +2291,9 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, _callback);
+        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
index 88f0ea9a8fd4..6a4ecf6393ff 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 

From 56836dabd0b7af928086d63a6ed7f38d4e432354 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 17 Dec 2024 09:53:34 +0100
Subject: [PATCH 04/22] bugfix-20188: Fix compilation error in FakeApiTest.java

---
 .../test/java/org/openapitools/client/api/FakeApiTest.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index d02ae0d2a053..bc2512b5ba66 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -264,7 +264,9 @@ public void testEnumParametersTest() throws ApiException {
         Double enumQueryDouble = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        Double enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         // TODO: test validations
     }
 

From 32865b169b1e836c741a7f67e00a51891d609fbb Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:04:19 +0100
Subject: [PATCH 05/22] apply to more libraries, improve test

---
 .../libraries/microprofile/enumClass.mustache |  2 +-
 .../okhttp-gson/modelInnerEnum.mustache       |  2 +-
 ...points-models-for-testing-okhttp-gson.yaml |  2 +-
 ...ith-fake-endpoints-models-for-testing.yaml | 29 ++++++++
 .../java/okhttp-gson/api/openapi.yaml         |  3 +-
 .../petstore/java/okhttp-gson/docs/FakeApi.md |  4 +-
 .../openapitools/client/model/EnumArrays.java |  8 +-
 .../client/model/EnumStringDiscriminator.java |  4 +-
 .../openapitools/client/model/EnumTest.java   | 12 +--
 .../openapitools/client/model/MapTest.java    |  4 +-
 .../org/openapitools/client/model/NewPet.java |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../client/model/PetComposition.java          |  6 +-
 .../org/openapitools/client/model/PetRef.java |  6 +-
 .../client/model/PetUsingAllOf.java           |  6 +-
 .../client/model/PetWithRequiredTags.java     |  6 +-
 .../org/openapitools/client/model/Zebra.java  |  6 +-
 .../petstore/java/resteasy/api/openapi.yaml   | 30 ++++++++
 .../petstore/java/resteasy/docs/FakeApi.md    |  8 +-
 .../petstore/java/resteasy/docs/Order.md      | 10 +++
 .../org/openapitools/client/model/Order.java  | 74 ++++++++++++++++++-
 22 files changed, 191 insertions(+), 49 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
index 9315b9c9d974..cf50d662d80d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
@@ -15,7 +15,7 @@
     {{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{^withXml}}
-    {{#enumVars}}{{name}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}){{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{/allowableValues}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
index d21f03c3c5e0..0fb357f79a1e 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
@@ -17,7 +17,7 @@
     {{#withXml}}
     @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
     {{/withXml}}
-    {{{name}}}({{{value}}}){{^-last}},
+    {{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
index fcac5b53b58a..04cd554627d6 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
@@ -691,7 +691,7 @@ paths:
                   default: 1
                 enum_form_double:
                   description: Form parameter enum test (double)
-                  type: double
+                  type: number
                   enum:
                     - 1.1
                     - -1.1
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index e4957b4e19d1..7092e29ce33f 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -710,6 +710,23 @@ paths:
                     - '-efg'
                     - (xyz)
                   default: '-efg'
+                enum_form_integer:
+                  description: Form parameter enum test (integer)
+                  type: integer
+                  enum:
+                    - 1
+                    - -1
+                    - 0
+                  default: 1
+                enum_form_double:
+                  description: Form parameter enum test (double)
+                  type: number
+                  enum:
+                    - 1.1
+                    - -1.1
+                    - 0.1
+                    - 0.0
+                  default: 1.1
     post:
       tags:
         - fake
@@ -1417,6 +1434,18 @@ components:
         complete:
           type: boolean
           default: false
+        paymentMethod:
+          type: number
+          format: int32
+          description: "Various payment methods"
+          default: 1
+          example: 1
+          x-enum-description:
+            - Paypal
+            - Creditcard
+          enum:
+            - 1
+            - 2
       xml:
         name: Order
     Category:
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index 315eea630b6a..fc1639b2ddb2 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -2985,13 +2985,14 @@ components:
           - 0
           type: integer
         enum_form_double:
+          default: 1.1
           description: Form parameter enum test (double)
           enum:
           - 1.1
           - -1.1
           - 0.1
           - 0.0
-          type: double
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index b031ec7edd76..90eb140aac25 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -1012,7 +1012,7 @@ public class Example {
     List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
     String enumFormString = "_abc"; // String | Form parameter enum test (string)
     Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
-    Double enumFormDouble = 1.1D; // Double | Form parameter enum test (double)
+    BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
     try {
       apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     } catch (ApiException e) {
@@ -1039,7 +1039,7 @@ public class Example {
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
 | **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
-| **enumFormDouble** | [**Double**](Double.md)| Form parameter enum test (double) | [optional] [enum: 1.1, -1.1, 0.1, 0.0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
index a2a982056356..874775a658b3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -57,9 +57,9 @@ public class EnumArrays {
    */
   @JsonAdapter(JustSymbolEnum.Adapter.class)
   public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
     
-    DOLLAR("$");
+    DOLLAR(String.valueOf("$"));
 
     private String value;
 
@@ -114,9 +114,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(ArrayEnumEnum.Adapter.class)
   public enum ArrayEnumEnum {
-    FISH("fish"),
+    FISH(String.valueOf("fish")),
     
-    CRAB("crab");
+    CRAB(String.valueOf("crab"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
index a0ecb583c688..d5dd702cdc47 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
@@ -55,9 +55,9 @@ public class EnumStringDiscriminator {
    */
   @JsonAdapter(EnumStrTypeEnum.Adapter.class)
   public enum EnumStrTypeEnum {
-    A("type_a"),
+    A(String.valueOf("type_a")),
     
-    B("type_b");
+    B(String.valueOf("type_b"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index dc9779e8e068..05231f894d57 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -60,11 +60,11 @@ public class EnumTest {
    */
   @JsonAdapter(EnumStringEnum.Adapter.class)
   public enum EnumStringEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -119,11 +119,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
   public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
index 123aaa3a888f..25363a3fe8bc 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -62,9 +62,9 @@ public class MapTest {
    */
   @JsonAdapter(InnerEnum.Adapter.class)
   public enum InnerEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower");
+    LOWER(String.valueOf("lower"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
index 6ee8a25bdbfc..1b9221e3f289 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
@@ -100,11 +100,11 @@ public class NewPet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index da2dc6491881..9d9311ed40ed 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index 2cbbfdbb45a6..917622684d06 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
index 59add75ea68e..24dd08225aa0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
@@ -84,11 +84,11 @@ public class PetComposition {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
index 019ea3cfdc90..5d52fcc4aeee 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
@@ -84,11 +84,11 @@ public class PetRef {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
index d9dd26116902..e2bfab5fe5a3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
@@ -84,11 +84,11 @@ public class PetUsingAllOf {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
index 0eb3e1ebab78..337c2196a2b9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
@@ -84,11 +84,11 @@ public class PetWithRequiredTags {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
index 24e2d7c29d8d..624e6ceaa158 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
@@ -55,11 +55,11 @@ public class Zebra {
    */
   @JsonAdapter(TypeEnum.Adapter.class)
   public enum TypeEnum {
-    PLAINS("plains"),
+    PLAINS(String.valueOf("plains")),
     
-    MOUNTAIN("mountain"),
+    MOUNTAIN(String.valueOf("mountain")),
     
-    GREVYS("grevys");
+    GREVYS(String.valueOf("grevys"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/resteasy/api/openapi.yaml
+++ b/samples/client/petstore/java/resteasy/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeApi.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/resteasy/docs/Order.md b/samples/client/petstore/java/resteasy/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/resteasy/docs/Order.md
+++ b/samples/client/petstore/java/resteasy/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 0e1782a89015..6c5758e3911c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +292,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -265,12 +331,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -283,6 +350,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }

From f5bb5dc459882a9218bfa5aa627f4ef8465d4599 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 8 Apr 2025 13:38:50 +0200
Subject: [PATCH 06/22] Generate samples

---
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../client/model/DefaultValue.java            |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Query.java  |  6 +-
 .../openapitools/client/model/SomeObj.java    |  2 +-
 .../java-helidon-client/v3/mp/docs/FakeApi.md |  4 +-
 .../java-helidon-client/v3/mp/docs/Order.md   | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  2 +-
 .../org/openapitools/client/model/Order.java  | 48 ++++++++++
 .../java-helidon-client/v3/se/docs/FakeApi.md |  8 +-
 .../java-helidon-client/v3/se/docs/Order.md   | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  4 +-
 .../openapitools/client/api/FakeApiImpl.java  | 16 ++--
 .../org/openapitools/client/model/Order.java  | 48 ++++++++++
 .../java-helidon-client/v4/mp/docs/FakeApi.md |  4 +-
 .../java-helidon-client/v4/mp/docs/Order.md   | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  2 +-
 .../org/openapitools/client/model/Order.java  | 48 ++++++++++
 .../java-helidon-client/v4/se/docs/FakeApi.md |  8 +-
 .../java-helidon-client/v4/se/docs/Order.md   | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  4 +-
 .../openapitools/client/api/FakeApiImpl.java  | 16 ++--
 .../org/openapitools/client/model/Order.java  | 48 ++++++++++
 .../java/apache-httpclient/api/openapi.yaml   | 30 +++++++
 .../java/apache-httpclient/docs/FakeApi.md    |  8 +-
 .../java/apache-httpclient/docs/Order.md      | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 14 ++-
 .../org/openapitools/client/model/Order.java  | 84 +++++++++++++++++-
 .../petstore/java/feign/api/openapi.yaml      | 30 +++++++
 .../org/openapitools/client/api/FakeApi.java  | 16 +++-
 .../org/openapitools/client/model/Order.java  | 75 +++++++++++++++-
 .../docs/FakeApi.md                           |  8 +-
 .../docs/Order.md                             | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  2 +-
 .../openapitools/client/model/EnumTest.java   |  4 +-
 .../org/openapitools/client/model/Order.java  | 68 +++++++++++++-
 .../docs/FakeApi.md                           |  8 +-
 .../docs/Order.md                             | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  2 +-
 .../openapitools/client/model/EnumTest.java   |  4 +-
 .../org/openapitools/client/model/Order.java  | 75 +++++++++++++++-
 .../microprofile-rest-client/docs/FakeApi.md  |  8 +-
 .../microprofile-rest-client/docs/Order.md    | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  2 +-
 .../openapitools/client/model/EnumTest.java   |  4 +-
 .../org/openapitools/client/model/Order.java  | 75 +++++++++++++++-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/BigCat.java |  8 +-
 .../openapitools/client/model/EnumArrays.java |  8 +-
 .../openapitools/client/model/EnumTest.java   | 12 +--
 .../openapitools/client/model/MapTest.java    |  4 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../model/PetWithRequiredNullableCases1.java  |  6 +-
 .../model/PetWithRequiredNullableCases2.java  |  6 +-
 .../org/openapitools/client/model/BigCat.java |  8 +-
 .../openapitools/client/model/EnumArrays.java |  8 +-
 .../openapitools/client/model/EnumTest.java   | 12 +--
 .../openapitools/client/model/MapTest.java    |  4 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/model/Order.java  |  6 +-
 .../org/openapitools/client/model/Pet.java    |  6 +-
 .../org/openapitools/client/api/FakeApi.java  | 18 ++--
 .../java/restclient-swagger2/api/openapi.yaml | 30 +++++++
 .../java/restclient-swagger2/docs/FakeApi.md  |  8 +-
 .../java/restclient-swagger2/docs/Order.md    | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 26 ++++--
 .../api/openapi.yaml                          | 30 +++++++
 .../docs/FakeApi.md                           |  8 +-
 .../docs/Order.md                             | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 34 ++++---
 .../petstore/java/restclient/api/openapi.yaml | 30 +++++++
 .../petstore/java/restclient/docs/FakeApi.md  |  8 +-
 .../petstore/java/restclient/docs/Order.md    | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 26 ++++--
 .../org/openapitools/client/api/FakeApi.java  |  8 +-
 .../resttemplate-withXml/api/openapi.yaml     | 30 +++++++
 .../java/resttemplate-withXml/docs/FakeApi.md |  8 +-
 .../java/resttemplate-withXml/docs/Order.md   | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 14 ++-
 .../org/openapitools/client/model/Order.java  | 81 ++++++++++++++++-
 .../java/resttemplate/api/openapi.yaml        | 30 +++++++
 .../java/resttemplate/docs/FakeApi.md         |  8 +-
 .../petstore/java/resttemplate/docs/Order.md  | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 14 ++-
 .../org/openapitools/client/model/Order.java  | 84 ++++++++++++++++--
 .../petstore/java/vertx/api/openapi.yaml      | 30 +++++++
 .../petstore/java/vertx/docs/FakeApi.md       |  8 +-
 .../client/petstore/java/vertx/docs/Order.md  | 10 +++
 .../org/openapitools/client/api/FakeApi.java  |  4 +-
 .../openapitools/client/api/FakeApiImpl.java  | 12 ++-
 .../client/api/rxjava/FakeApi.java            | 24 +++--
 .../org/openapitools/client/model/Order.java  | 74 +++++++++++++++-
 .../java/webclient-jakarta/api/openapi.yaml   | 30 +++++++
 .../java/webclient-jakarta/docs/FakeApi.md    |  8 +-
 .../java/webclient-jakarta/docs/Order.md      | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 26 ++++--
 .../org/openapitools/client/model/Order.java  | 74 +++++++++++++++-
 .../java/webclient-swagger2/api/openapi.yaml  | 30 +++++++
 .../java/webclient-swagger2/docs/FakeApi.md   |  8 +-
 .../java/webclient-swagger2/docs/Order.md     | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 26 ++++--
 .../org/openapitools/client/model/Order.java  | 75 +++++++++++++++-
 .../api/openapi.yaml                          | 30 +++++++
 .../docs/FakeApi.md                           |  8 +-
 .../docs/Order.md                             | 10 +++
 .../org/openapitools/client/model/Order.java  | 74 +++++++++++++++-
 .../petstore/java/webclient/api/openapi.yaml  | 30 +++++++
 .../petstore/java/webclient/docs/FakeApi.md   |  8 +-
 .../petstore/java/webclient/docs/Order.md     | 10 +++
 .../org/openapitools/client/api/FakeApi.java  | 26 ++++--
 .../org/openapitools/client/model/Order.java  | 74 +++++++++++++++-
 .../petstore/ruby-autoload/docs/FakeApi.md    |  6 +-
 .../petstore/ruby-autoload/docs/Order.md      |  4 +-
 .../lib/petstore/api/fake_api.rb              | 14 +++
 .../lib/petstore/models/order.rb              | 32 ++++++-
 .../petstore/ruby-faraday/docs/FakeApi.md     |  6 +-
 .../petstore/ruby-faraday/docs/Order.md       |  4 +-
 .../ruby-faraday/lib/petstore/api/fake_api.rb | 14 +++
 .../ruby-faraday/lib/petstore/models/order.rb | 32 ++++++-
 .../builds/default-v3.0/apis/FakeApi.ts       | 29 ++++++
 .../builds/default-v3.0/models/Order.ts       | 17 ++++
 .../doc/FakeApi.md                            |  8 +-
 .../doc/Order.md                              |  1 +
 .../lib/src/api/fake_api.dart                 |  4 +
 .../lib/src/model/order.dart                  | 43 ++++++++-
 .../petstore_client_lib_fake/doc/FakeApi.md   |  8 +-
 .../petstore_client_lib_fake/doc/Order.md     |  1 +
 .../lib/src/api/fake_api.dart                 |  6 ++
 .../lib/src/model/order.dart                  | 43 ++++++++-
 .../petstore_client_lib_fake/doc/FakeApi.md   |  8 +-
 .../petstore_client_lib_fake/doc/Order.md     |  1 +
 .../lib/api/fake_api.dart                     | 24 ++++-
 .../lib/model/order.dart                      | 88 ++++++++++++++++++-
 samples/schema/petstore/mysql/Model/Order.sql |  6 +-
 .../schema/petstore/mysql/mysql_schema.sql    |  3 +-
 .../cpp-restbed/generated/3_0/api/FakeApi.cpp |  8 +-
 .../cpp-restbed/generated/3_0/api/FakeApi.h   |  6 +-
 .../cpp-restbed/generated/3_0/model/Order.cpp | 21 +++++
 .../cpp-restbed/generated/3_0/model/Order.h   |  7 ++
 .../openapitools/server/api/FakeService.java  |  2 +-
 .../server/api/FakeServiceImpl.java           |  2 +-
 .../org/openapitools/server/model/Order.java  | 74 ++++++++++++++++
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../org/openapitools/server/model/Order.java  | 57 +++++++++++-
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../openapitools/server/api/FakeService.java  |  2 +-
 .../server/api/FakeServiceImpl.java           |  2 +-
 .../org/openapitools/server/model/Order.java  | 74 ++++++++++++++++
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../openapitools/server/api/FakeService.java  | 59 ++++++++++++-
 .../server/api/FakeServiceImpl.java           |  4 +-
 .../org/openapitools/server/model/Order.java  | 57 +++++++++++-
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../openapitools/server/api/FakeService.java  | 59 ++++++++++++-
 .../server/api/FakeServiceImpl.java           |  4 +-
 .../org/openapitools/server/model/Order.java  | 57 +++++++++++-
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../org/openapitools/server/model/Order.java  | 57 +++++++++++-
 .../src/main/resources/META-INF/openapi.yml   | 30 +++++++
 .../mockserver/api/FakeApiMockServer.java     | 24 ++++-
 .../mockserver/api/StoreApiMockServer.java    | 10 +--
 .../java/org/openapitools/api/FakeApi.java    |  4 +-
 .../org/openapitools/api/FakeApiService.java  |  2 +-
 .../java/org/openapitools/model/Order.java    | 65 +++++++++++++-
 .../api/impl/FakeApiServiceImpl.java          |  2 +-
 .../java/org/openapitools/api/FakeApi.java    |  2 +-
 .../java/org/openapitools/model/Order.java    | 81 ++++++++++++++++-
 .../src/main/resources/META-INF/openapi.yaml  | 30 +++++++
 .../java/org/openapitools/api/FakeApi.java    |  4 +-
 .../org/openapitools/api/FakeApiService.java  |  2 +-
 .../java/org/openapitools/model/Order.java    | 65 +++++++++++++-
 .../api/impl/FakeApiServiceImpl.java          |  2 +-
 .../php-laravel/.openapi-generator/FILES      |  3 +
 .../php-laravel/Api/FakeApiInterface.php      |  4 +
 .../Http/Controllers/FakeController.php       | 10 ++-
 .../petstore/php-laravel/Model/Order.php      |  4 +
 .../php-laravel/Model/OrderPaymentMethod.php  | 34 +++++++
 ...estEnumParametersRequestEnumFormDouble.php | 36 ++++++++
 ...stEnumParametersRequestEnumFormInteger.php | 35 ++++++++
 .../lib/app/Http/Controllers/FakeApi.php      |  4 +
 192 files changed, 3540 insertions(+), 352 deletions(-)
 create mode 100644 samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php
 create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php
 create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php

diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
index 6cd3f4066e13..3b81fd196824 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
index c8142d9b7d67..cf2e37cdcdd6 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java
index cb8c3d0c308d..d8c814425816 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -64,11 +64,11 @@ public class DefaultValue {
    */
   @JsonAdapter(ArrayStringEnumDefaultEnum.Adapter.class)
   public enum ArrayStringEnumDefaultEnum {
-    SUCCESS("success"),
+    SUCCESS(String.valueOf("success")),
     
-    FAILURE("failure"),
+    FAILURE(String.valueOf("failure")),
     
-    UNCLASSIFIED("unclassified");
+    UNCLASSIFIED(String.valueOf("unclassified"));
 
     private String value;
 
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index 3a4080c7199c..cd3ab70b6da5 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java
index c68933898a3e..cdda82621925 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java
@@ -62,11 +62,11 @@ public class Query {
    */
   @JsonAdapter(OutcomesEnum.Adapter.class)
   public enum OutcomesEnum {
-    SUCCESS("SUCCESS"),
+    SUCCESS(String.valueOf("SUCCESS")),
     
-    FAILURE("FAILURE"),
+    FAILURE(String.valueOf("FAILURE")),
     
-    SKIPPED("SKIPPED");
+    SKIPPED(String.valueOf("SKIPPED"));
 
     private String value;
 
diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
index e13577046a6a..e2f78fcb3d19 100644
--- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
+++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
@@ -58,7 +58,7 @@ public class SomeObj implements Serializable {
    */
   @JsonAdapter(TypeEnum.Adapter.class)
   public enum TypeEnum {
-    SOMEOBJIDENTIFIER("SomeObjIdentifier");
+    SOMEOBJIDENTIFIER(String.valueOf("SomeObjIdentifier"));
 
     private String value;
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
index 4cdd475689dd..5869ecbd2271 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
@@ -526,7 +526,7 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 ## testEnumParameters
 
-> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -546,6 +546,8 @@ To test enum parameters
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
index fda6b183e193..106181a538f6 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -152,7 +152,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array") List<String> enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array") List<String> enumFormStringArray, @FormParam("enum_form_string") String enumFormString, @FormParam("enum_form_integer") Integer enumFormInteger, @FormParam("enum_form_double") BigDecimal enumFormDouble) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..5aa83727e198 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,32 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -180,6 +207,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +242,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
index a7f954df9a69..c6a18e91f6f4 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -120,9 +120,11 @@ public interface FakeApi {
   * @param enumQueryModelArray  (optional)
   * @param enumFormStringArray Form parameter enum test (string array) (optional)
   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+  * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+  * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
   * @return {@code ApiResponse<Void>}
   */
-  ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString);
+  ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble);
 
  /**
   * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index 8f6e7f539c0c..bfa42aa128c3 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -681,9 +681,9 @@ protected ApiResponse<Void> testEndpointParametersSubmit(WebClientRequestBuilder
   }
 
   @Override
-  public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
-    WebClientRequestBuilder webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
-    return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+  public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
+    WebClientRequestBuilder webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+    return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
   }
 
   /**
@@ -699,9 +699,11 @@ public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray,
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @return WebClientRequestBuilder for testEnumParameters
    */
-  protected WebClientRequestBuilder testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+  protected WebClientRequestBuilder testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
     WebClientRequestBuilder webClientRequestBuilder = apiClient.webClient()
             .method("GET");
 
@@ -742,12 +744,16 @@ protected WebClientRequestBuilder testEnumParametersRequestBuilder(List<String>
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @return {@code ApiResponse<Void>} for the submitted request
    */
-  protected ApiResponse<Void> testEnumParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+  protected ApiResponse<Void> testEnumParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
     String formParams = new StringJoiner("&")
             .add("enum_form_string_array=" + enumFormStringArray)
             .add("enum_form_string=" + enumFormString)
+            .add("enum_form_integer=" + enumFormInteger)
+            .add("enum_form_double=" + enumFormDouble)
             .toString();
     Single<WebClientResponse> webClientResponse = webClientRequestBuilder.submit(formParams);
     return ApiResponse.create(RESPONSE_TYPE_testEnumParameters, webClientResponse);
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..5aa83727e198 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,32 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -180,6 +207,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +242,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
index 4cdd475689dd..5869ecbd2271 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
@@ -526,7 +526,7 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 
 ## testEnumParameters
 
-> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -546,6 +546,8 @@ To test enum parameters
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
index 62cc34c3e484..03f8812d5737 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -153,7 +153,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array") List<String> enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam("enum_form_string_array") List<String> enumFormStringArray, @FormParam("enum_form_string") String enumFormString, @FormParam("enum_form_integer") Integer enumFormInteger, @FormParam("enum_form_double") BigDecimal enumFormDouble) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..5aa83727e198 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,32 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -180,6 +207,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +242,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java
index 54def85a491c..cd0cdbe96c1b 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -121,9 +121,11 @@ public interface FakeApi {
   * @param enumQueryModelArray  (optional)
   * @param enumFormStringArray Form parameter enum test (string array) (optional)
   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+  * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+  * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
   * @return {@code ApiResponse<Void>}
   */
-  ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString);
+  ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble);
 
  /**
   * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index de72f948f8fe..571b8d0cb7cf 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -683,9 +683,9 @@ protected ApiResponse<Void> testEndpointParametersSubmit(HttpClientRequest webCl
   }
 
   @Override
-  public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
-    HttpClientRequest webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
-    return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+  public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
+    HttpClientRequest webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+    return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
   }
 
   /**
@@ -701,9 +701,11 @@ public ApiResponse<Void> testEnumParameters(List<String> enumHeaderStringArray,
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @return HttpClientRequest for testEnumParameters
    */
-  protected HttpClientRequest testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+  protected HttpClientRequest testEnumParametersRequestBuilder(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
     HttpClientRequest webClientRequestBuilder = apiClient.webClient()
             .method(Method.GET);
 
@@ -744,12 +746,16 @@ protected HttpClientRequest testEnumParametersRequestBuilder(List<String> enumHe
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @return {@code ApiResponse<Void>} for the submitted request
    */
-  protected ApiResponse<Void> testEnumParametersSubmit(HttpClientRequest webClientRequestBuilder, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+  protected ApiResponse<Void> testEnumParametersSubmit(HttpClientRequest webClientRequestBuilder, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
     String formParams = new StringJoiner("&")
             .add("enum_form_string_array=" + enumFormStringArray)
             .add("enum_form_string=" + enumFormString)
+            .add("enum_form_integer=" + enumFormInteger)
+            .add("enum_form_double=" + enumFormDouble)
             .toString();
     HttpClientResponse webClientResponse = webClientRequestBuilder.submit(formParams);
     return ApiResponse.create(RESPONSE_TYPE_testEnumParameters, webClientResponse);
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..5aa83727e198 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,32 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -180,6 +207,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +242,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
+++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/apache-httpclient/docs/Order.md b/samples/client/petstore/java/apache-httpclient/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/Order.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
index ebef01c2072e..13745d9f5ac9 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1135,10 +1135,12 @@ public void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number,
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @throws ApiException if fails to make API call
    */
-  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException {
-    this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, Collections.emptyMap());
+  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
+    this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, Collections.emptyMap());
   }
 
 
@@ -1154,10 +1156,12 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @param additionalHeaders additionalHeaders for this call
    * @throws ApiException if fails to make API call
    */
-  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, Map<String, String> additionalHeaders) throws ApiException {
+  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Map<String, String> additionalHeaders) throws ApiException {
     Object localVarPostBody = null;
     
     // create path and map variables
@@ -1188,6 +1192,10 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
       localVarFormParams.put("enum_form_string_array", enumFormStringArray);
 if (enumFormString != null)
       localVarFormParams.put("enum_form_string", enumFormString);
+if (enumFormInteger != null)
+      localVarFormParams.put("enum_form_integer", enumFormInteger);
+if (enumFormDouble != null)
+      localVarFormParams.put("enum_form_double", enumFormDouble);
 
     final String[] localVarAccepts = {
       
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
index e14bfaf7f443..a3c874bcce9e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -36,7 +37,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -101,6 +103,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -254,6 +295,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -268,12 +334,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -286,6 +353,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -393,6 +461,16 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
+    // add `paymentMethod` to the URL query string
+    if (getPaymentMethod() != null) {
+      try {
+        joiner.add(String.format("%spaymentMethod%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPaymentMethod()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     return joiner.toString();
   }
 
diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/feign/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
index 17293273af5d..404e7cd6489c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -570,6 +570,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    */
   @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
   @Headers({
@@ -579,7 +581,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
     
     "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
 
   /**
    * To test enum parameters
@@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    */
   @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
   @Headers({
@@ -603,7 +607,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
     
     "enum_header_string: {enumHeaderString}"
   })
-  ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
+  ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
 
 
   /**
@@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @param queryParams Map of query parameters as name-value pairs
    *   <p>The following elements may be specified in the query map:</p>
    *   <ul>
@@ -636,7 +642,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
       "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
 
   /**
   * To test enum parameters
@@ -647,6 +653,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
               * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
               * @param enumFormStringArray Form parameter enum test (string array) (optional)
               * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+              * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+              * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
       * @param queryParams Map of query parameters as name-value pairs
       *   <p>The following elements may be specified in the query map:</p>
       *   <ul>
@@ -665,7 +673,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
           "enum_header_string: {enumHeaderString}"
       })
-   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index f7452464bfb2..8be9fddac5a9 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -257,6 +298,32 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
   }
 
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -271,12 +338,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -289,6 +357,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md
index 02df4858d16b..11175099fcb2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md
@@ -982,7 +982,7 @@ public class Example {
 
 ## testEnumParameters
 
-> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1013,8 +1013,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
@@ -1041,6 +1043,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
index 4993c503e5f3..bc2204ee2642 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
index c23faf8ba1b8..9498a51afe0d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -164,7 +164,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString, @Multipart(value = "enum_form_integer", required = false)  Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false)  BigDecimal enumFormDouble) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index c896035c6e69..0d5e5b65d533 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -116,7 +116,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
 
   public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -152,7 +152,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
 
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
index 271bd025d550..cbc6ed3a862b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -31,7 +32,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 
 public class Order  {
@@ -95,6 +97,45 @@ public static StatusEnum fromValue(String value) {
   
   private Boolean complete = false;
 
+  public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    @JsonValue
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+        public static PaymentMethodEnum fromValue(BigDecimal value) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (b.value.equals(value)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + value + "'");
+        }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+ /**
+  * Various payment methods
+  */
+  
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   /**
    * Get id
    * @return id
@@ -239,6 +280,30 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
@@ -263,6 +328,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md
index 02df4858d16b..11175099fcb2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md
@@ -982,7 +982,7 @@ public class Example {
 
 ## testEnumParameters
 
-> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1013,8 +1013,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
@@ -1041,6 +1043,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
index 4993c503e5f3..bc2204ee2642 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
index c23faf8ba1b8..9498a51afe0d 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -164,7 +164,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString, @Multipart(value = "enum_form_integer", required = false)  Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false)  BigDecimal enumFormDouble) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
index 90a4b5150488..9ef4fff63284 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -130,7 +130,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -175,7 +175,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
index 5a3f97ede37b..430cf33812d7 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
@@ -14,6 +14,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
@@ -96,6 +97,54 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
+  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
+  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
+  public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
+        @Override
+        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
+        @Override
+        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Various payment methods
+  */
+  @JsonbProperty("paymentMethod")
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   /**
    * Get id
    * @return id
@@ -216,6 +265,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -230,12 +299,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   /**
@@ -252,6 +322,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md
index 02df4858d16b..11175099fcb2 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md
@@ -982,7 +982,7 @@ public class Example {
 
 ## testEnumParameters
 
-> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1013,8 +1013,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
             System.out.println(result);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
@@ -1041,6 +1043,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
index 4993c503e5f3..bc2204ee2642 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
index 411aebd5d178..818499a4654b 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -164,7 +164,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString) throws ApiException, ProcessingException;
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @Multipart(value = "enum_form_string_array", required = false)  List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false)  String enumFormString, @Multipart(value = "enum_form_integer", required = false)  Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false)  BigDecimal enumFormDouble) throws ApiException, ProcessingException;
 
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 489fb70ed740..7fe3260cc677 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -127,7 +127,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -172,7 +172,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index e8f48097237f..4674a7755135 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -14,6 +14,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import javax.json.bind.annotation.JsonbTypeDeserializer;
@@ -93,6 +94,54 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
+  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
+  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
+  public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
+        @Override
+        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
+        @Override
+        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Various payment methods
+  */
+  @JsonbProperty("paymentMethod")
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   /**
    * Get id
    * @return id
@@ -213,6 +262,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -227,12 +296,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   /**
@@ -249,6 +319,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
index 89a277698aac..0a4a359f32f9 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
index 5a40c063a7a3..b3e9c2504d57 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
index 89a277698aac..0a4a359f32f9 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java
index 5a40c063a7a3..b3e9c2504d57 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
index 052b2d06e53e..232113baf1b8 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
@@ -56,13 +56,13 @@ public class BigCat extends Cat {
    */
   @JsonAdapter(KindEnum.Adapter.class)
   public enum KindEnum {
-    LIONS("lions"),
+    LIONS(String.valueOf("lions")),
     
-    TIGERS("tigers"),
+    TIGERS(String.valueOf("tigers")),
     
-    LEOPARDS("leopards"),
+    LEOPARDS(String.valueOf("leopards")),
     
-    JAGUARS("jaguars");
+    JAGUARS(String.valueOf("jaguars"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java
index d857cacc6cc6..217ca7704260 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -57,9 +57,9 @@ public class EnumArrays {
    */
   @JsonAdapter(JustSymbolEnum.Adapter.class)
   public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
     
-    DOLLAR("$");
+    DOLLAR(String.valueOf("$"));
 
     private String value;
 
@@ -114,9 +114,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(ArrayEnumEnum.Adapter.class)
   public enum ArrayEnumEnum {
-    FISH("fish"),
+    FISH(String.valueOf("fish")),
     
-    CRAB("crab");
+    CRAB(String.valueOf("crab"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
index 1026b34b8070..e5b920abc7cb 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -56,11 +56,11 @@ public class EnumTest {
    */
   @JsonAdapter(EnumStringEnum.Adapter.class)
   public enum EnumStringEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -115,11 +115,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
   public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java
index e34d9ec4ffae..431c08ba466b 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java
@@ -62,9 +62,9 @@ public class MapTest {
    */
   @JsonAdapter(InnerEnum.Adapter.class)
   public enum InnerEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower");
+    LOWER(String.valueOf("lower"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
index 733e945b21c1..cd7de28e2e1f 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java
index e06d023d8064..c313b5f33770 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java
@@ -86,11 +86,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
index 89a277698aac..0a4a359f32f9 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
index 5a40c063a7a3..b3e9c2504d57 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
index 89a277698aac..0a4a359f32f9 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
@@ -76,11 +76,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
index 5a40c063a7a3..b3e9c2504d57 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
@@ -84,11 +84,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
index f8996d4e06db..ddf00c548c58 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
@@ -85,11 +85,11 @@ public class PetWithRequiredNullableCases1 {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
index 44891aeae9d1..36a6c356c8fb 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
@@ -84,11 +84,11 @@ public class PetWithRequiredNullableCases2 {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
index 127e4ad4f71e..f3c896cbea5a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
@@ -58,13 +58,13 @@ public class BigCat extends Cat implements Parcelable {
    */
   @JsonAdapter(KindEnum.Adapter.class)
   public enum KindEnum {
-    LIONS("lions"),
+    LIONS(String.valueOf("lions")),
     
-    TIGERS("tigers"),
+    TIGERS(String.valueOf("tigers")),
     
-    LEOPARDS("leopards"),
+    LEOPARDS(String.valueOf("leopards")),
     
-    JAGUARS("jaguars");
+    JAGUARS(String.valueOf("jaguars"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
index dee24a8322da..f7df6851784d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -59,9 +59,9 @@ public class EnumArrays implements Parcelable {
    */
   @JsonAdapter(JustSymbolEnum.Adapter.class)
   public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
     
-    DOLLAR("$");
+    DOLLAR(String.valueOf("$"));
 
     private String value;
 
@@ -116,9 +116,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(ArrayEnumEnum.Adapter.class)
   public enum ArrayEnumEnum {
-    FISH("fish"),
+    FISH(String.valueOf("fish")),
     
-    CRAB("crab");
+    CRAB(String.valueOf("crab"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index c1b089933e10..57fa7db093f0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -58,11 +58,11 @@ public class EnumTest implements Parcelable {
    */
   @JsonAdapter(EnumStringEnum.Adapter.class)
   public enum EnumStringEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -117,11 +117,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
    */
   @JsonAdapter(EnumStringRequiredEnum.Adapter.class)
   public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
     
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
index 1632f5567cc0..f48d1635bf1b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -64,9 +64,9 @@ public class MapTest implements Parcelable {
    */
   @JsonAdapter(InnerEnum.Adapter.class)
   public enum InnerEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
     
-    LOWER("lower");
+    LOWER(String.valueOf("lower"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index c887cb33190d..007c4374604d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -78,11 +78,11 @@ public class Order implements Parcelable {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
index bf2d988b98e4..cc4fc7865b54 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
@@ -88,11 +88,11 @@ public class Pet implements Parcelable {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
index 653fe892cbf7..03d4cd7c0828 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
@@ -79,11 +79,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
index 2cc2f214be7a..f9cd4813b4c0 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java
@@ -87,11 +87,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
index 3aeabe89714e..0fdd3673192a 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -78,11 +78,11 @@ public class Order {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    PLACED("placed"),
+    PLACED(String.valueOf("placed")),
     
-    APPROVED("approved"),
+    APPROVED(String.valueOf("approved")),
     
-    DELIVERED("delivered");
+    DELIVERED(String.valueOf("delivered"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index d15072c93a1d..fb3ac7e90d81 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -86,11 +86,11 @@ public class Pet {
    */
   @JsonAdapter(StatusEnum.Adapter.class)
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
     
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
     
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
index 63a6d4b47df3..f0b6f952bd50 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -2109,7 +2109,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @param _callback Callback for upload/download progress
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
@@ -2121,7 +2121,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -2208,7 +2208,7 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<Strin
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
         return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
 
     }
@@ -2225,7 +2225,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table border="1">
@@ -2235,7 +2235,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble) throws ApiException {
+    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
         testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
@@ -2251,7 +2251,7 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @return ApiResponse&lt;Void&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
@@ -2262,7 +2262,7 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble) throws ApiException {
+    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
         okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null);
         return localVarApiClient.execute(localVarCall);
     }
@@ -2279,7 +2279,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -2291,7 +2291,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable Double enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
 
         okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
diff --git a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/Order.md b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
index d724ad1b7dca..dda9e3ebe991 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1162,9 +1162,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<>();
@@ -1189,6 +1191,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1217,11 +1223,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType);
+        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType);
     }
 
     /**
@@ -1238,11 +1246,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHea
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1259,11 +1269,13 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
index 6dc28bf0797e..33d333d93c7f 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1263,7 +1263,7 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N
         return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
     }
 
-    public record TestEnumParametersRequest(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString){}
+    public record TestEnumParametersRequest(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble){}
 
     /**
     * To test enum parameters
@@ -1274,7 +1274,7 @@ public record TestEnumParametersRequest(@jakarta.annotation.Nullable List<String
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public void testEnumParameters(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
   /**
@@ -1286,7 +1286,7 @@ public void testEnumParameters(TestEnumParametersRequest requestParameters) thro
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public ResponseEntity<Void> testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
   /**
@@ -1299,7 +1299,7 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(TestEnumParametersReq
   * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
     /**
@@ -1316,9 +1316,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<>();
@@ -1343,6 +1345,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1371,11 +1377,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType);
+        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType);
     }
 
     /**
@@ -1392,11 +1400,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHea
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1413,11 +1423,13 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     public record TestGroupParametersRequest(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group){}
diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/restclient/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/restclient/docs/FakeApi.md b/samples/client/petstore/java/restclient/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/restclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/restclient/docs/Order.md b/samples/client/petstore/java/restclient/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/restclient/docs/Order.md
+++ b/samples/client/petstore/java/restclient/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
index d724ad1b7dca..dda9e3ebe991 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1162,9 +1162,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<>();
@@ -1189,6 +1191,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1217,11 +1223,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType);
+        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType);
     }
 
     /**
@@ -1238,11 +1246,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHea
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1259,11 +1269,13 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
     /**
      * Fake endpoint to test group parameters (optional)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
index 2e103e10656c..bb4922f31646 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -692,9 +692,11 @@ public void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number,
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @throws ApiException if fails to make API call
    */
-  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException {
+  public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
     Object localVarPostBody = null;
     
     // create path and map variables
@@ -722,6 +724,10 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
       localVarFormParams.put("enum_form_string_array", enumFormStringArray);
 if (enumFormString != null)
       localVarFormParams.put("enum_form_string", enumFormString);
+if (enumFormInteger != null)
+      localVarFormParams.put("enum_form_integer", enumFormInteger);
+if (enumFormDouble != null)
+      localVarFormParams.put("enum_form_double", enumFormDouble);
 
     final String[] localVarAccepts = {
       
diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
index 6af820bca4aa..414357671a55 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -773,10 +773,12 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
      * @param enumQueryModelArray  (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
-        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException {
+        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
@@ -793,10 +795,12 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
      * @param enumQueryModelArray  (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @return ResponseEntity&lt;Void&gt;
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException {
         Object localVarPostBody = null;
         
 
@@ -821,6 +825,10 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHead
             localVarFormParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             localVarFormParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            localVarFormParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            localVarFormParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = {  };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index 4310a4b7fd74..04ac44e98953 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -37,7 +38,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 @XmlRootElement(name = "Order")
@@ -117,6 +119,50 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  @XmlType(name="PaymentMethodEnum")
+  @XmlEnum(BigDecimal.class)
+  public enum PaymentMethodEnum {
+    @XmlEnumValue(new BigDecimal("1"))
+    NUMBER_1(new BigDecimal("1")),
+    
+    @XmlEnumValue(new BigDecimal("2"))
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @XmlElement(name = "paymentMethod")
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -282,6 +328,33 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "paymentMethod")
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "paymentMethod")
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -297,12 +370,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -315,6 +389,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/resttemplate/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/resttemplate/docs/Order.md b/samples/client/petstore/java/resttemplate/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/resttemplate/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
index 6af820bca4aa..414357671a55 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -773,10 +773,12 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
      * @param enumQueryModelArray  (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
-        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException {
+        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
@@ -793,10 +795,12 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
      * @param enumQueryModelArray  (optional)
      * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+     * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @return ResponseEntity&lt;Void&gt;
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) throws RestClientException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException {
         Object localVarPostBody = null;
         
 
@@ -821,6 +825,10 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(List<String> enumHead
             localVarFormParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             localVarFormParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            localVarFormParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            localVarFormParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = {  };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index bcff63f2a6bd..ef20c271bc01 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,19 +100,59 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
   /**
    * Constructor with all args parameters
    */
-  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
+  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete, @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) PaymentMethodEnum paymentMethod) {
     this.id = id;
     this.petId = petId;
     this.quantity = quantity;
     this.shipDate = shipDate;
     this.status = status;
     this.complete = complete;
+    this.paymentMethod = paymentMethod;
   }
 
   public Order id(@javax.annotation.Nullable Long id) {
@@ -263,6 +305,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -278,12 +345,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -296,6 +364,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -347,6 +416,10 @@ public Order.Builder complete(Boolean complete) {
       this.instance.complete = complete;
       return this;
     }
+    public Order.Builder paymentMethod(PaymentMethodEnum paymentMethod) {
+      this.instance.paymentMethod = paymentMethod;
+      return this;
+    }
 
 
     /**
@@ -386,7 +459,8 @@ public Order.Builder toBuilder() {
       .quantity(getQuantity())
       .shipDate(getShipDate())
       .status(getStatus())
-      .complete(getComplete());
+      .complete(getComplete())
+      .paymentMethod(getPaymentMethod());
   }
 
 
diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/vertx/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md
index 22cff7dd2e8a..8d12ae9b0f80 100644
--- a/samples/client/petstore/java/vertx/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/vertx/docs/Order.md b/samples/client/petstore/java/vertx/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/vertx/docs/Order.md
+++ b/samples/client/petstore/java/vertx/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
index f3f934b1c703..bec8c7caa62e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -80,9 +80,9 @@ public interface FakeApi {
 
     void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable AsyncFile binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
 
-    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, Handler<AsyncResult<Void>> handler);
+    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Handler<AsyncResult<Void>> handler);
 
-    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
+    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
 
     void testGroupParameters(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group, Handler<AsyncResult<Void>> handler);
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index c8b96dda8296..69904375aa85 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -772,10 +772,12 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         * @param enumQueryModelArray  (optional)
         * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
         * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+        * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+        * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> resultHandler) {
-        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, null, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, Handler<AsyncResult<Void>> resultHandler) {
+        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null, resultHandler);
     }
 
     /**
@@ -790,10 +792,12 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
         Object localVarBody = null;
         
         // create path and map variables
@@ -822,6 +826,8 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
         Map<String, Object> localVarFormParams = new HashMap<>();
         if (enumFormStringArray != null) localVarFormParams.put("enum_form_string_array", enumFormStringArray);
 if (enumFormString != null) localVarFormParams.put("enum_form_string", enumFormString);
+if (enumFormInteger != null) localVarFormParams.put("enum_form_integer", enumFormInteger);
+if (enumFormDouble != null) localVarFormParams.put("enum_form_double", enumFormDouble);
 
         String[] localVarAccepts = {  };
         String[] localVarContentTypes = { "application/x-www-form-urlencoded" };
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
index 7d56463f60e2..6a0ff7794f39 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
@@ -734,10 +734,12 @@ public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double,
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, resultHandler);
     }
 
     /**
@@ -752,11 +754,13 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, resultHandler);
     }
 
     /**
@@ -771,11 +775,13 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, fut)
+            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, fut)
         ));
     }
 
@@ -791,12 +797,14 @@ public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, Str
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo) {
+    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, fut)
+            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, fut)
         ));
     }
     /**
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 0e1782a89015..6c5758e3911c 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +292,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -265,12 +331,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -283,6 +350,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/Order.md b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/Order.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
index 76f31144834b..e33c52ac45ec 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1179,9 +1179,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<String, Object>();
@@ -1206,6 +1208,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1234,11 +1240,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<Void> testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1255,11 +1263,13 @@ public Mono<Void> testEnumParameters(@jakarta.annotation.Nullable List<String> e
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1276,11 +1286,13 @@ public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@jakarta.annota
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
index a314bb8d5294..cce369f99c2a 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +292,31 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +332,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -284,6 +351,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/Order.md b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
index 63785420e96e..da877b3f153d 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1179,9 +1179,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<String, Object>();
@@ -1206,6 +1208,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1234,11 +1240,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1255,11 +1263,13 @@ public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enu
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1276,11 +1286,13 @@ public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotati
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index 4de247cdc05e..d5258f4367eb 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,7 +35,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -99,6 +101,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -258,6 +299,32 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods")
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -273,12 +340,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -291,6 +359,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index b0d7d12d6f62..71c7f6b2cd39 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +292,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +332,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -284,6 +351,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml
index 7d3a48a0496b..c0a178ebd51a 100644
--- a/samples/client/petstore/java/webclient/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient/api/openapi.yaml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/webclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/webclient/docs/Order.md b/samples/client/petstore/java/webclient/docs/Order.md
index 27af32855c5c..b25552d366d9 100644
--- a/samples/client/petstore/java/webclient/docs/Order.md
+++ b/samples/client/petstore/java/webclient/docs/Order.md
@@ -13,6 +13,7 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -26,3 +27,12 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 63785420e96e..da877b3f153d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1179,9 +1179,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<String, Object>();
@@ -1206,6 +1208,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1234,11 +1240,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1255,11 +1263,13 @@ public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enu
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1276,11 +1286,13 @@ public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotati
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     /**
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index b0d7d12d6f62..71c7f6b2cd39 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +292,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +332,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -284,6 +351,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/ruby-autoload/docs/FakeApi.md b/samples/client/petstore/ruby-autoload/docs/FakeApi.md
index 4262104d12af..ae7f5c8286a1 100644
--- a/samples/client/petstore/ruby-autoload/docs/FakeApi.md
+++ b/samples/client/petstore/ruby-autoload/docs/FakeApi.md
@@ -983,7 +983,9 @@ opts = {
   enum_query_double: 1.1, # Float | Query parameter enum test (double)
   enum_query_model_array: [Petstore::EnumClass::ABC], # Array<EnumClass> | 
   enum_form_string_array: ['>'], # Array<String> | Form parameter enum test (string array)
-  enum_form_string: '_abc' # String | Form parameter enum test (string)
+  enum_form_string: '_abc', # String | Form parameter enum test (string)
+  enum_form_integer: 1, # Integer | Form parameter enum test (integer)
+  enum_form_double: 1.1 # Float | Form parameter enum test (double)
 }
 
 begin
@@ -1025,6 +1027,8 @@ end
 | **enum_query_model_array** | [**Array&lt;EnumClass&gt;**](EnumClass.md) |  | [optional] |
 | **enum_form_string_array** | [**Array&lt;String&gt;**](String.md) | Form parameter enum test (string array) | [optional][default to &#39;$&#39;] |
 | **enum_form_string** | **String** | Form parameter enum test (string) | [optional][default to &#39;-efg&#39;] |
+| **enum_form_integer** | **Integer** | Form parameter enum test (integer) | [optional][default to 1] |
+| **enum_form_double** | **Float** | Form parameter enum test (double) | [optional][default to 1.1] |
 
 ### Return type
 
diff --git a/samples/client/petstore/ruby-autoload/docs/Order.md b/samples/client/petstore/ruby-autoload/docs/Order.md
index a3fd55138068..961b8605e8ea 100644
--- a/samples/client/petstore/ruby-autoload/docs/Order.md
+++ b/samples/client/petstore/ruby-autoload/docs/Order.md
@@ -10,6 +10,7 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
+| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
 
 ## Example
 
@@ -22,7 +23,8 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null
+  complete: null,
+  payment_method: 1
 )
 ```
 
diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb
index 0a7729c304c4..b9c1334b7481 100644
--- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb
@@ -1024,6 +1024,8 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
     # @option opts [Array<EnumClass>] :enum_query_model_array 
     # @option opts [Array<String>] :enum_form_string_array Form parameter enum test (string array) (default to '$')
     # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg')
+    # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1)
+    # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1)
     # @return [nil]
     def test_enum_parameters(opts = {})
       test_enum_parameters_with_http_info(opts)
@@ -1042,6 +1044,8 @@ def test_enum_parameters(opts = {})
     # @option opts [Array<EnumClass>] :enum_query_model_array 
     # @option opts [Array<String>] :enum_form_string_array Form parameter enum test (string array) (default to '$')
     # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg')
+    # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1)
+    # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1)
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def test_enum_parameters_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -1079,6 +1083,14 @@ def test_enum_parameters_with_http_info(opts = {})
       if @api_client.config.client_side_validation && opts[:'enum_form_string'] && !allowable_values.include?(opts[:'enum_form_string'])
         fail ArgumentError, "invalid value for \"enum_form_string\", must be one of #{allowable_values}"
       end
+      allowable_values = [1, -1, 0]
+      if @api_client.config.client_side_validation && opts[:'enum_form_integer'] && !allowable_values.include?(opts[:'enum_form_integer'])
+        fail ArgumentError, "invalid value for \"enum_form_integer\", must be one of #{allowable_values}"
+      end
+      allowable_values = [1.1, -1.1, 0.1, 0.0]
+      if @api_client.config.client_side_validation && opts[:'enum_form_double'] && !allowable_values.include?(opts[:'enum_form_double'])
+        fail ArgumentError, "invalid value for \"enum_form_double\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/fake'
 
@@ -1104,6 +1116,8 @@ def test_enum_parameters_with_http_info(opts = {})
       form_params = opts[:form_params] || {}
       form_params['enum_form_string_array'] = @api_client.build_collection_param(opts[:'enum_form_string_array'], :csv) if !opts[:'enum_form_string_array'].nil?
       form_params['enum_form_string'] = opts[:'enum_form_string'] if !opts[:'enum_form_string'].nil?
+      form_params['enum_form_integer'] = opts[:'enum_form_integer'] if !opts[:'enum_form_integer'].nil?
+      form_params['enum_form_double'] = opts[:'enum_form_double'] if !opts[:'enum_form_double'].nil?
 
       # http body (model)
       post_body = opts[:debug_body]
diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
index b18e3bb16d52..74d81f206c19 100644
--- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
@@ -28,6 +28,9 @@ class Order
 
     attr_accessor :complete
 
+    # Various payment methods
+    attr_accessor :payment_method
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -58,7 +61,8 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete'
+        :'complete' => :'complete',
+        :'payment_method' => :'paymentMethod'
       }
     end
 
@@ -80,7 +84,8 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean'
+        :'complete' => :'Boolean',
+        :'payment_method' => :'Float'
       }
     end
 
@@ -131,6 +136,12 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
+
+      if attributes.key?(:'payment_method')
+        self.payment_method = attributes[:'payment_method']
+      else
+        self.payment_method = PAYMENT_METHOD::N1
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,6 +158,8 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
+      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
+      return false unless payment_method_validator.valid?(@payment_method)
       true
     end
 
@@ -160,6 +173,16 @@ def status=(status)
       @status = status
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] payment_method Object to be assigned
+    def payment_method=(payment_method)
+      validator = EnumAttributeValidator.new('Float', [1, 2])
+      unless validator.valid?(payment_method)
+        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
+      end
+      @payment_method = payment_method
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -170,7 +193,8 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete
+          complete == o.complete &&
+          payment_method == o.payment_method
     end
 
     # @see the `==` method
@@ -182,7 +206,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete].hash
+      [id, pet_id, quantity, ship_date, status, complete, payment_method].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/ruby-faraday/docs/FakeApi.md b/samples/client/petstore/ruby-faraday/docs/FakeApi.md
index 4262104d12af..ae7f5c8286a1 100644
--- a/samples/client/petstore/ruby-faraday/docs/FakeApi.md
+++ b/samples/client/petstore/ruby-faraday/docs/FakeApi.md
@@ -983,7 +983,9 @@ opts = {
   enum_query_double: 1.1, # Float | Query parameter enum test (double)
   enum_query_model_array: [Petstore::EnumClass::ABC], # Array<EnumClass> | 
   enum_form_string_array: ['>'], # Array<String> | Form parameter enum test (string array)
-  enum_form_string: '_abc' # String | Form parameter enum test (string)
+  enum_form_string: '_abc', # String | Form parameter enum test (string)
+  enum_form_integer: 1, # Integer | Form parameter enum test (integer)
+  enum_form_double: 1.1 # Float | Form parameter enum test (double)
 }
 
 begin
@@ -1025,6 +1027,8 @@ end
 | **enum_query_model_array** | [**Array&lt;EnumClass&gt;**](EnumClass.md) |  | [optional] |
 | **enum_form_string_array** | [**Array&lt;String&gt;**](String.md) | Form parameter enum test (string array) | [optional][default to &#39;$&#39;] |
 | **enum_form_string** | **String** | Form parameter enum test (string) | [optional][default to &#39;-efg&#39;] |
+| **enum_form_integer** | **Integer** | Form parameter enum test (integer) | [optional][default to 1] |
+| **enum_form_double** | **Float** | Form parameter enum test (double) | [optional][default to 1.1] |
 
 ### Return type
 
diff --git a/samples/client/petstore/ruby-faraday/docs/Order.md b/samples/client/petstore/ruby-faraday/docs/Order.md
index a3fd55138068..961b8605e8ea 100644
--- a/samples/client/petstore/ruby-faraday/docs/Order.md
+++ b/samples/client/petstore/ruby-faraday/docs/Order.md
@@ -10,6 +10,7 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
+| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
 
 ## Example
 
@@ -22,7 +23,8 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null
+  complete: null,
+  payment_method: 1
 )
 ```
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
index 0a7729c304c4..b9c1334b7481 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
@@ -1024,6 +1024,8 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli
     # @option opts [Array<EnumClass>] :enum_query_model_array 
     # @option opts [Array<String>] :enum_form_string_array Form parameter enum test (string array) (default to '$')
     # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg')
+    # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1)
+    # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1)
     # @return [nil]
     def test_enum_parameters(opts = {})
       test_enum_parameters_with_http_info(opts)
@@ -1042,6 +1044,8 @@ def test_enum_parameters(opts = {})
     # @option opts [Array<EnumClass>] :enum_query_model_array 
     # @option opts [Array<String>] :enum_form_string_array Form parameter enum test (string array) (default to '$')
     # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg')
+    # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1)
+    # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1)
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def test_enum_parameters_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -1079,6 +1083,14 @@ def test_enum_parameters_with_http_info(opts = {})
       if @api_client.config.client_side_validation && opts[:'enum_form_string'] && !allowable_values.include?(opts[:'enum_form_string'])
         fail ArgumentError, "invalid value for \"enum_form_string\", must be one of #{allowable_values}"
       end
+      allowable_values = [1, -1, 0]
+      if @api_client.config.client_side_validation && opts[:'enum_form_integer'] && !allowable_values.include?(opts[:'enum_form_integer'])
+        fail ArgumentError, "invalid value for \"enum_form_integer\", must be one of #{allowable_values}"
+      end
+      allowable_values = [1.1, -1.1, 0.1, 0.0]
+      if @api_client.config.client_side_validation && opts[:'enum_form_double'] && !allowable_values.include?(opts[:'enum_form_double'])
+        fail ArgumentError, "invalid value for \"enum_form_double\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/fake'
 
@@ -1104,6 +1116,8 @@ def test_enum_parameters_with_http_info(opts = {})
       form_params = opts[:form_params] || {}
       form_params['enum_form_string_array'] = @api_client.build_collection_param(opts[:'enum_form_string_array'], :csv) if !opts[:'enum_form_string_array'].nil?
       form_params['enum_form_string'] = opts[:'enum_form_string'] if !opts[:'enum_form_string'].nil?
+      form_params['enum_form_integer'] = opts[:'enum_form_integer'] if !opts[:'enum_form_integer'].nil?
+      form_params['enum_form_double'] = opts[:'enum_form_double'] if !opts[:'enum_form_double'].nil?
 
       # http body (model)
       post_body = opts[:debug_body]
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
index b18e3bb16d52..74d81f206c19 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
@@ -28,6 +28,9 @@ class Order
 
     attr_accessor :complete
 
+    # Various payment methods
+    attr_accessor :payment_method
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -58,7 +61,8 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete'
+        :'complete' => :'complete',
+        :'payment_method' => :'paymentMethod'
       }
     end
 
@@ -80,7 +84,8 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean'
+        :'complete' => :'Boolean',
+        :'payment_method' => :'Float'
       }
     end
 
@@ -131,6 +136,12 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
+
+      if attributes.key?(:'payment_method')
+        self.payment_method = attributes[:'payment_method']
+      else
+        self.payment_method = PAYMENT_METHOD::N1
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,6 +158,8 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
+      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
+      return false unless payment_method_validator.valid?(@payment_method)
       true
     end
 
@@ -160,6 +173,16 @@ def status=(status)
       @status = status
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] payment_method Object to be assigned
+    def payment_method=(payment_method)
+      validator = EnumAttributeValidator.new('Float', [1, 2])
+      unless validator.valid?(payment_method)
+        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
+      end
+      @payment_method = payment_method
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -170,7 +193,8 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete
+          complete == o.complete &&
+          payment_method == o.payment_method
     end
 
     # @see the `==` method
@@ -182,7 +206,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete].hash
+      [id, pet_id, quantity, ship_date, status, complete, payment_method].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
index 12df4e513874..2531723376c6 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
@@ -126,6 +126,8 @@ export interface TestEnumParametersRequest {
     enumQueryModelArray?: Array<EnumClass>;
     enumFormStringArray?: Array<TestEnumParametersEnumFormStringArrayEnum>;
     enumFormString?: TestEnumParametersEnumFormStringEnum;
+    enumFormInteger?: TestEnumParametersEnumFormIntegerEnum;
+    enumFormDouble?: TestEnumParametersEnumFormDoubleEnum;
 }
 
 export interface TestGroupParametersRequest {
@@ -811,6 +813,14 @@ export class FakeApi extends runtime.BaseAPI {
             formParams.append('enum_form_string', requestParameters['enumFormString'] as any);
         }
 
+        if (requestParameters['enumFormInteger'] != null) {
+            formParams.append('enum_form_integer', requestParameters['enumFormInteger'] as any);
+        }
+
+        if (requestParameters['enumFormDouble'] != null) {
+            formParams.append('enum_form_double', requestParameters['enumFormDouble'] as any);
+        }
+
         const response = await this.request({
             path: `/fake`,
             method: 'GET',
@@ -1286,3 +1296,22 @@ export const TestEnumParametersEnumFormStringEnum = {
     Xyz: '(xyz)'
 } as const;
 export type TestEnumParametersEnumFormStringEnum = typeof TestEnumParametersEnumFormStringEnum[keyof typeof TestEnumParametersEnumFormStringEnum];
+/**
+ * @export
+ */
+export const TestEnumParametersEnumFormIntegerEnum = {
+    NUMBER_1: 1,
+    NUMBER_MINUS_1: -1,
+    NUMBER_0: 0
+} as const;
+export type TestEnumParametersEnumFormIntegerEnum = typeof TestEnumParametersEnumFormIntegerEnum[keyof typeof TestEnumParametersEnumFormIntegerEnum];
+/**
+ * @export
+ */
+export const TestEnumParametersEnumFormDoubleEnum = {
+    NUMBER_1_DOT_1: 1.1,
+    NUMBER_MINUS_1_DOT_1: -1.1,
+    NUMBER_0_DOT_1: 0.1,
+    NUMBER_0_DOT_0: 0.0
+} as const;
+export type TestEnumParametersEnumFormDoubleEnum = typeof TestEnumParametersEnumFormDoubleEnum[keyof typeof TestEnumParametersEnumFormDoubleEnum];
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
index 2e9a77af0484..e12ee981b009 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
@@ -55,6 +55,12 @@ export interface Order {
      * @memberof Order
      */
     complete?: boolean;
+    /**
+     * Various payment methods
+     * @type {number}
+     * @memberof Order
+     */
+    paymentMethod?: OrderPaymentMethodEnum;
 }
 
 
@@ -68,6 +74,15 @@ export const OrderStatusEnum = {
 } as const;
 export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum];
 
+/**
+ * @export
+ */
+export const OrderPaymentMethodEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2
+} as const;
+export type OrderPaymentMethodEnum = typeof OrderPaymentMethodEnum[keyof typeof OrderPaymentMethodEnum];
+
 
 /**
  * Check if a given object implements the Order interface.
@@ -92,6 +107,7 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
         'shipDate': json['shipDate'] == null ? undefined : (new Date(json['shipDate'])),
         'status': json['status'] == null ? undefined : json['status'],
         'complete': json['complete'] == null ? undefined : json['complete'],
+        'paymentMethod': json['paymentMethod'] == null ? undefined : json['paymentMethod'],
     };
 }
 
@@ -112,6 +128,7 @@ export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: bool
         'shipDate': value['shipDate'] == null ? undefined : ((value['shipDate']).toISOString()),
         'status': value['status'],
         'complete': value['complete'],
+        'paymentMethod': value['paymentMethod'],
     };
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
index 1b5e1ca297c8..936ee209dd27 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
@@ -651,7 +651,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -671,9 +671,11 @@ final double enumQueryDouble = 1.2; // double | Query parameter enum test (doubl
 final List<ModelEnumClass> enumQueryModelArray = ; // List<ModelEnumClass> | 
 final List<String> enumFormStringArray = ; // List<String> | Form parameter enum test (string array)
 final String enumFormString = enumFormString_example; // String | Form parameter enum test (string)
+final int enumFormInteger = 56; // int | Form parameter enum test (integer)
+final num enumFormDouble = 8.14; // num | Form parameter enum test (double)
 
 try {
-    api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 } catch on DioException (e) {
     print('Exception when calling FakeApi->testEnumParameters: $e\n');
 }
@@ -692,6 +694,8 @@ Name | Type | Description  | Notes
  **enumQueryModelArray** | [**List&lt;ModelEnumClass&gt;**](ModelEnumClass.md)|  | [optional] 
  **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [default to '$']
  **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg']
+ **enumFormInteger** | **int**| Form parameter enum test (integer) | [optional] [default to 1]
+ **enumFormDouble** | **num**| Form parameter enum test (double) | [optional] [default to 1.1]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
index bde5ffe51a2c..a2529b10ff13 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/fake_api.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/fake_api.dart
index 06486358eda5..879493debfb1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/api/fake_api.dart
@@ -1159,6 +1159,8 @@ _responseData = rawData == null ? null : deserialize<ModelClient, ModelClient>(r
   /// * [enumQueryModelArray] 
   /// * [enumFormStringArray] - Form parameter enum test (string array)
   /// * [enumFormString] - Form parameter enum test (string)
+  /// * [enumFormInteger] - Form parameter enum test (integer)
+  /// * [enumFormDouble] - Form parameter enum test (double)
   /// * [cancelToken] - A [CancelToken] that can be used to cancel the operation
   /// * [headers] - Can be used to add additional headers to the request
   /// * [extras] - Can be used to add flags to the request
@@ -1178,6 +1180,8 @@ _responseData = rawData == null ? null : deserialize<ModelClient, ModelClient>(r
     List<ModelEnumClass>? enumQueryModelArray,
     List<String>? enumFormStringArray,
     String? enumFormString,
+    int? enumFormInteger,
+    num? enumFormDouble,
     CancelToken? cancelToken,
     Map<String, dynamic>? headers,
     Map<String, dynamic>? extra,
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
index dfbc4f5c5e41..ae715ba0d441 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
@@ -29,6 +29,8 @@ class Order {
      this.status,
 
      this.complete = false,
+
+     this.paymentMethod = const OrderPaymentMethodEnum._(1),
   });
 
   @JsonKey(
@@ -105,6 +107,20 @@ class Order {
 
 
 
+      /// Various payment methods
+  @JsonKey(
+    defaultValue: 1,
+    name: r'paymentMethod',
+    required: false,
+    includeIfNull: false,
+  unknownEnumValue: OrderPaymentMethodEnum.unknownDefaultOpenApi,
+  )
+
+
+  final OrderPaymentMethodEnum? paymentMethod;
+
+
+
 
 
     @override
@@ -114,7 +130,8 @@ class Order {
       other.quantity == quantity &&
       other.shipDate == shipDate &&
       other.status == status &&
-      other.complete == complete;
+      other.complete == complete &&
+      other.paymentMethod == paymentMethod;
 
     @override
     int get hashCode =>
@@ -123,7 +140,8 @@ class Order {
         quantity.hashCode +
         shipDate.hashCode +
         status.hashCode +
-        complete.hashCode;
+        complete.hashCode +
+        paymentMethod.hashCode;
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 
@@ -160,3 +178,24 @@ String toString() => value;
 }
 
 
+/// Various payment methods
+enum OrderPaymentMethodEnum {
+    /// Various payment methods
+@JsonValue('1')
+n1(''1''),
+    /// Various payment methods
+@JsonValue('2')
+n2(''2''),
+    /// Various payment methods
+@JsonValue('11184809')
+unknownDefaultOpenApi(''11184809'');
+
+const OrderPaymentMethodEnum(this.value);
+
+final String value;
+
+@override
+String toString() => value;
+}
+
+
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
index d9ba061a46e0..10e02c2f84a2 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
@@ -651,7 +651,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -671,9 +671,11 @@ final double enumQueryDouble = 1.2; // double | Query parameter enum test (doubl
 final BuiltList<ModelEnumClass> enumQueryModelArray = ; // BuiltList<ModelEnumClass> | 
 final BuiltList<String> enumFormStringArray = ; // BuiltList<String> | Form parameter enum test (string array)
 final String enumFormString = enumFormString_example; // String | Form parameter enum test (string)
+final int enumFormInteger = 56; // int | Form parameter enum test (integer)
+final num enumFormDouble = 8.14; // num | Form parameter enum test (double)
 
 try {
-    api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 } catch on DioException (e) {
     print('Exception when calling FakeApi->testEnumParameters: $e\n');
 }
@@ -692,6 +694,8 @@ Name | Type | Description  | Notes
  **enumQueryModelArray** | [**BuiltList&lt;ModelEnumClass&gt;**](ModelEnumClass.md)|  | [optional] 
  **enumFormStringArray** | [**BuiltList&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [default to '$']
  **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg']
+ **enumFormInteger** | **int**| Form parameter enum test (integer) | [optional] [default to 1]
+ **enumFormDouble** | **num**| Form parameter enum test (double) | [optional] [default to 1.1]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
index bde5ffe51a2c..a2529b10ff13 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/fake_api.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/fake_api.dart
index 1cfaf9712ad4..099b470c6d51 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/api/fake_api.dart
@@ -1222,6 +1222,8 @@ class FakeApi {
   /// * [enumQueryModelArray] 
   /// * [enumFormStringArray] - Form parameter enum test (string array)
   /// * [enumFormString] - Form parameter enum test (string)
+  /// * [enumFormInteger] - Form parameter enum test (integer)
+  /// * [enumFormDouble] - Form parameter enum test (double)
   /// * [cancelToken] - A [CancelToken] that can be used to cancel the operation
   /// * [headers] - Can be used to add additional headers to the request
   /// * [extras] - Can be used to add flags to the request
@@ -1241,6 +1243,8 @@ class FakeApi {
     BuiltList<ModelEnumClass>? enumQueryModelArray,
     BuiltList<String>? enumFormStringArray,
     String? enumFormString,
+    int? enumFormInteger,
+    num? enumFormDouble,
     CancelToken? cancelToken,
     Map<String, dynamic>? headers,
     Map<String, dynamic>? extra,
@@ -1278,6 +1282,8 @@ class FakeApi {
       _bodyData = <String, dynamic>{
         if (enumFormStringArray != null) r'enum_form_string_array': encodeCollectionQueryParameter<String>(_serializers, enumFormStringArray, const FullType(BuiltList, [FullType(String)]), format: ListFormat.csv,),
         if (enumFormString != null) r'enum_form_string': encodeQueryParameter(_serializers, enumFormString, const FullType(String)),
+        if (enumFormInteger != null) r'enum_form_integer': encodeQueryParameter(_serializers, enumFormInteger, const FullType(int)),
+        if (enumFormDouble != null) r'enum_form_double': encodeQueryParameter(_serializers, enumFormDouble, const FullType(num)),
       };
 
     } catch(error, stackTrace) {
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
index a44e1b340c1e..08f0e5d5508c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
@@ -18,6 +18,7 @@ part 'order.g.dart';
 /// * [shipDate] 
 /// * [status] - Order Status
 /// * [complete] 
+/// * [paymentMethod] - Various payment methods
 @BuiltValue()
 abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'id')
@@ -40,13 +41,19 @@ abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'complete')
   bool? get complete;
 
+  /// Various payment methods
+  @BuiltValueField(wireName: r'paymentMethod')
+  OrderPaymentMethodEnum? get paymentMethod;
+  // enum paymentMethodEnum {  1,  2,  };
+
   Order._();
 
   factory Order([void updates(OrderBuilder b)]) = _$Order;
 
   @BuiltValueHook(initializeBuilder: true)
   static void _defaults(OrderBuilder b) => b
-      ..complete = false;
+      ..complete = false
+      ..paymentMethod = const OrderPaymentMethodEnum._(1);
 
   @BuiltValueSerializer(custom: true)
   static Serializer<Order> get serializer => _$OrderSerializer();
@@ -106,6 +113,13 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
         specifiedType: const FullType(bool),
       );
     }
+    if (object.paymentMethod != null) {
+      yield r'paymentMethod';
+      yield serializers.serialize(
+        object.paymentMethod,
+        specifiedType: const FullType(OrderPaymentMethodEnum),
+      );
+    }
   }
 
   @override
@@ -171,6 +185,13 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
           ) as bool;
           result.complete = valueDes;
           break;
+        case r'paymentMethod':
+          final valueDes = serializers.deserialize(
+            value,
+            specifiedType: const FullType(OrderPaymentMethodEnum),
+          ) as OrderPaymentMethodEnum;
+          result.paymentMethod = valueDes;
+          break;
         default:
           unhandled.add(key);
           unhandled.add(value);
@@ -223,3 +244,23 @@ class OrderStatusEnum extends EnumClass {
   static OrderStatusEnum valueOf(String name) => _$orderStatusEnumValueOf(name);
 }
 
+class OrderPaymentMethodEnum extends EnumClass {
+
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'1')
+  static const OrderPaymentMethodEnum n1 = _$orderPaymentMethodEnum_n1;
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'2')
+  static const OrderPaymentMethodEnum n2 = _$orderPaymentMethodEnum_n2;
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'11184809', fallback: true)
+  static const OrderPaymentMethodEnum unknownDefaultOpenApi = _$orderPaymentMethodEnum_unknownDefaultOpenApi;
+
+  static Serializer<OrderPaymentMethodEnum> get serializer => _$orderPaymentMethodEnumSerializer;
+
+  const OrderPaymentMethodEnum._(String name): super(name);
+
+  static BuiltSet<OrderPaymentMethodEnum> get values => _$orderPaymentMethodEnumValues;
+  static OrderPaymentMethodEnum valueOf(String name) => _$orderPaymentMethodEnumValueOf(name);
+}
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
index e5c71555c9a8..2c7d6cf15e6b 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
@@ -651,7 +651,7 @@ void (empty response body)
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -671,9 +671,11 @@ final enumQueryDouble = 1.2; // double | Query parameter enum test (double)
 final enumQueryModelArray = []; // List<EnumClass> | 
 final enumFormStringArray = []; // List<String> | Form parameter enum test (string array)
 final enumFormString = enumFormString_example; // String | Form parameter enum test (string)
+final enumFormInteger = 56; // int | Form parameter enum test (integer)
+final enumFormDouble = 8.14; // num | Form parameter enum test (double)
 
 try {
-    api_instance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    api_instance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 } catch (e) {
     print('Exception when calling FakeApi->testEnumParameters: $e\n');
 }
@@ -692,6 +694,8 @@ Name | Type | Description  | Notes
  **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)|  | [optional] [default to const []]
  **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [default to '$']
  **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to '-efg']
+ **enumFormInteger** | **int**| Form parameter enum test (integer) | [optional] [default to 1]
+ **enumFormDouble** | **num**| Form parameter enum test (double) | [optional] [default to 1.1]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
index bde5ffe51a2c..a2529b10ff13 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
@@ -14,6 +14,7 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
index 1fa377f864dd..6403ba8a243c 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
@@ -883,7 +883,13 @@ class FakeApi {
   ///
   /// * [String] enumFormString:
   ///   Form parameter enum test (string)
-  Future<Response> testEnumParametersWithHttpInfo({ List<String>? enumHeaderStringArray, String? enumHeaderString, List<String>? enumQueryStringArray, String? enumQueryString, int? enumQueryInteger, double? enumQueryDouble, List<EnumClass>? enumQueryModelArray, List<String>? enumFormStringArray, String? enumFormString, }) async {
+  ///
+  /// * [int] enumFormInteger:
+  ///   Form parameter enum test (integer)
+  ///
+  /// * [num] enumFormDouble:
+  ///   Form parameter enum test (double)
+  Future<Response> testEnumParametersWithHttpInfo({ List<String>? enumHeaderStringArray, String? enumHeaderString, List<String>? enumQueryStringArray, String? enumQueryString, int? enumQueryInteger, double? enumQueryDouble, List<EnumClass>? enumQueryModelArray, List<String>? enumFormStringArray, String? enumFormString, int? enumFormInteger, num? enumFormDouble, }) async {
     // ignore: prefer_const_declarations
     final path = r'/fake';
 
@@ -925,6 +931,12 @@ class FakeApi {
     if (enumFormString != null) {
       formParams[r'enum_form_string'] = parameterToString(enumFormString);
     }
+    if (enumFormInteger != null) {
+      formParams[r'enum_form_integer'] = parameterToString(enumFormInteger);
+    }
+    if (enumFormDouble != null) {
+      formParams[r'enum_form_double'] = parameterToString(enumFormDouble);
+    }
 
     return apiClient.invokeAPI(
       path,
@@ -968,8 +980,14 @@ class FakeApi {
   ///
   /// * [String] enumFormString:
   ///   Form parameter enum test (string)
-  Future<void> testEnumParameters({ List<String>? enumHeaderStringArray, String? enumHeaderString, List<String>? enumQueryStringArray, String? enumQueryString, int? enumQueryInteger, double? enumQueryDouble, List<EnumClass>? enumQueryModelArray, List<String>? enumFormStringArray, String? enumFormString, }) async {
-    final response = await testEnumParametersWithHttpInfo( enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumQueryModelArray: enumQueryModelArray, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, );
+  ///
+  /// * [int] enumFormInteger:
+  ///   Form parameter enum test (integer)
+  ///
+  /// * [num] enumFormDouble:
+  ///   Form parameter enum test (double)
+  Future<void> testEnumParameters({ List<String>? enumHeaderStringArray, String? enumHeaderString, List<String>? enumQueryStringArray, String? enumQueryString, int? enumQueryInteger, double? enumQueryDouble, List<EnumClass>? enumQueryModelArray, List<String>? enumFormStringArray, String? enumFormString, int? enumFormInteger, num? enumFormDouble, }) async {
+    final response = await testEnumParametersWithHttpInfo( enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumQueryModelArray: enumQueryModelArray, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString, enumFormInteger: enumFormInteger, enumFormDouble: enumFormDouble, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
index bc591de9fab9..f9be19503afa 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
@@ -19,6 +19,7 @@ class Order {
     this.shipDate,
     this.status,
     this.complete = false,
+    this.paymentMethod = const OrderPaymentMethodEnum._(1),
   });
 
   ///
@@ -58,6 +59,9 @@ class Order {
 
   bool complete;
 
+  /// Various payment methods
+  OrderPaymentMethodEnum paymentMethod;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is Order &&
     other.id == id &&
@@ -65,7 +69,8 @@ class Order {
     other.quantity == quantity &&
     other.shipDate == shipDate &&
     other.status == status &&
-    other.complete == complete;
+    other.complete == complete &&
+    other.paymentMethod == paymentMethod;
 
   @override
   int get hashCode =>
@@ -75,10 +80,11 @@ class Order {
     (quantity == null ? 0 : quantity!.hashCode) +
     (shipDate == null ? 0 : shipDate!.hashCode) +
     (status == null ? 0 : status!.hashCode) +
-    (complete.hashCode);
+    (complete.hashCode) +
+    (paymentMethod.hashCode);
 
   @override
-  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete]';
+  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete, paymentMethod=$paymentMethod]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -108,6 +114,7 @@ class Order {
       json[r'status'] = null;
     }
       json[r'complete'] = this.complete;
+      json[r'paymentMethod'] = this.paymentMethod;
     return json;
   }
 
@@ -136,6 +143,7 @@ class Order {
         shipDate: mapDateTime(json, r'shipDate', r''),
         status: OrderStatusEnum.fromJson(json[r'status']),
         complete: mapValueOfType<bool>(json, r'complete') ?? false,
+        paymentMethod: OrderPaymentMethodEnum.parse('${json[r'paymentMethod']}'),
       );
     }
     return null;
@@ -263,3 +271,77 @@ class OrderStatusEnumTypeTransformer {
 }
 
 
+/// Various payment methods
+class OrderPaymentMethodEnum {
+  /// Instantiate a new enum with the provided [value].
+  const OrderPaymentMethodEnum._(this.value);
+
+  /// The underlying value of this enum member.
+  final num value;
+
+  @override
+  String toString() => value.toString();
+
+  num toJson() => value;
+
+  static const n1 = OrderPaymentMethodEnum._('1');
+  static const n2 = OrderPaymentMethodEnum._('2');
+
+  /// List of all possible values in this [enum][OrderPaymentMethodEnum].
+  static const values = <OrderPaymentMethodEnum>[
+    n1,
+    n2,
+  ];
+
+  static OrderPaymentMethodEnum? fromJson(dynamic value) => OrderPaymentMethodEnumTypeTransformer().decode(value);
+
+  static List<OrderPaymentMethodEnum> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <OrderPaymentMethodEnum>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = OrderPaymentMethodEnum.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [OrderPaymentMethodEnum] to num,
+/// and [decode] dynamic data back to [OrderPaymentMethodEnum].
+class OrderPaymentMethodEnumTypeTransformer {
+  factory OrderPaymentMethodEnumTypeTransformer() => _instance ??= const OrderPaymentMethodEnumTypeTransformer._();
+
+  const OrderPaymentMethodEnumTypeTransformer._();
+
+  num encode(OrderPaymentMethodEnum data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a OrderPaymentMethodEnum.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  OrderPaymentMethodEnum? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case '1': return OrderPaymentMethodEnum.n1;
+        case '2': return OrderPaymentMethodEnum.n2;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [OrderPaymentMethodEnumTypeTransformer] instance.
+  static OrderPaymentMethodEnumTypeTransformer? _instance;
+}
+
+
diff --git a/samples/schema/petstore/mysql/Model/Order.sql b/samples/schema/petstore/mysql/Model/Order.sql
index 43af471ffb5c..22efa6800382 100644
--- a/samples/schema/petstore/mysql/Model/Order.sql
+++ b/samples/schema/petstore/mysql/Model/Order.sql
@@ -7,17 +7,17 @@
 --
 -- SELECT template for table `Order`
 --
-SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete` FROM `Order` WHERE 1;
+SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod` FROM `Order` WHERE 1;
 
 --
 -- INSERT template for table `Order`
 --
-INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`) VALUES (?, ?, ?, ?, ?, ?);
+INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`) VALUES (?, ?, ?, ?, ?, ?, ?);
 
 --
 -- UPDATE template for table `Order`
 --
-UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ? WHERE 1;
+UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ?, `paymentMethod` = ? WHERE 1;
 
 --
 -- DELETE template for table `Order`
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index 0c526bdabd3e..5783c0f0d693 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -352,7 +352,8 @@ CREATE TABLE IF NOT EXISTS `Order` (
   `quantity` INT DEFAULT NULL,
   `shipDate` DATETIME DEFAULT NULL,
   `status` ENUM('placed', 'approved', 'delivered') DEFAULT NULL COMMENT 'Order Status',
-  `complete` TINYINT(1) DEFAULT false
+  `complete` TINYINT(1) DEFAULT false,
+  `paymentMethod` ENUM('1', '2') DEFAULT '1' COMMENT 'Various payment methods'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
index f8a2aaabe0d9..09a5ef9265f3 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
@@ -1668,6 +1668,8 @@ void FakeResource::handler_GET_internal(const std::shared_ptr<restbed::Session>
     std::vector<std::string> enumFormStringArray;
     boost::split(enumFormStringArray, enumFormStringArray_raw, boost::is_any_of(","));
     auto enumFormString = boost::lexical_cast<std::string>(extractFormParamsFromBody("enumFormString", extractBodyContent(session)));
+    auto enumFormInteger = boost::lexical_cast<int32_t>(extractFormParamsFromBody("enumFormInteger", extractBodyContent(session)));
+    auto enumFormDouble = boost::lexical_cast<double>(extractFormParamsFromBody("enumFormDouble", extractBodyContent(session)));
     // Getting the query params
     std::string enumQueryStringArray_raw = request->get_query_parameter("enumQueryStringArray");
     std::vector<std::string> enumQueryStringArray;
@@ -1693,7 +1695,7 @@ void FakeResource::handler_GET_internal(const std::shared_ptr<restbed::Session>
     
     try {
         status_code =
-            handler_GET(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            handler_GET(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
     catch(const FakeApiException& e) {
         std::tie(status_code, result) = handleFakeApiException(e);
@@ -1791,9 +1793,9 @@ int FakeResource::handler_POST(
     return handler_POST_func(number, r_double, patternWithoutDelimiter, byte, integer, int32, int64, r_float, string, binary, date, dateTime, password, callback);
 }
 int FakeResource::handler_GET(
-    std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString)
+    std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble)
 {
-    return handler_GET_func(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    return handler_GET_func(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 }
 int FakeResource::handler_DELETE(
     int32_t & requiredStringGroup, bool & requiredBooleanGroup, int64_t & requiredInt64Group, int32_t & stringGroup, bool & booleanGroup, int64_t & int64Group)
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
index 078736c18723..4693eef374fa 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
@@ -848,8 +848,8 @@ class  FakeResource: public restbed::Resource
                 { throw FakeApiException(501, "Not implemented"); };
 
     std::function<int(
-        std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString)> handler_GET_func =
-            [](std::vector<std::string> &, std::string &, std::vector<std::string> &, std::string &, int32_t &, double &, std::vector<EnumClass> &, std::vector<std::string> &, std::string &) -> int
+        std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble)> handler_GET_func =
+            [](std::vector<std::string> &, std::string &, std::vector<std::string> &, std::string &, int32_t &, double &, std::vector<EnumClass> &, std::vector<std::string> &, std::string &, int32_t &, double &) -> int
                 { throw FakeApiException(501, "Not implemented"); };
 
     std::function<int(
@@ -870,7 +870,7 @@ class  FakeResource: public restbed::Resource
     virtual int handler_POST(
         double & number, double & r_double, std::string & patternWithoutDelimiter, std::string & byte, int32_t & integer, int32_t & int32, int64_t & int64, float & r_float, std::string & string, std::string & binary, std::string & date, std::string & dateTime, std::string & password, std::string & callback);
     virtual int handler_GET(
-        std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString);
+        std::vector<std::string> & enumHeaderStringArray, std::string & enumHeaderString, std::vector<std::string> & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector<EnumClass> & enumQueryModelArray, std::vector<std::string> & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble);
     virtual int handler_DELETE(
         int32_t & requiredStringGroup, bool & requiredBooleanGroup, int64_t & requiredInt64Group, int32_t & stringGroup, bool & booleanGroup, int64_t & int64Group);
 
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
index e1fb8817f3ba..261b1fe68fe8 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
@@ -69,6 +69,7 @@ ptree Order::toPropertyTree() const
 	pt.put("shipDate", m_ShipDate);
 	pt.put("status", m_Status);
 	pt.put("complete", m_Complete);
+	pt.put("paymentMethod", m_PaymentMethod);
 	return pt;
 }
 
@@ -81,6 +82,7 @@ void Order::fromPropertyTree(ptree const &pt)
 	m_ShipDate = pt.get("shipDate", "");
 	setStatus(pt.get("status", ""));
 	m_Complete = pt.get("complete", false);
+	setPaymentMethod(pt.get("paymentMethod", 1));
 }
 
 int64_t Order::getId() const
@@ -157,6 +159,25 @@ void Order::setComplete(bool value)
 }
 
 
+double Order::getPaymentMethod() const
+{
+    return m_PaymentMethod;
+}
+
+void Order::setPaymentMethod(double value)
+{
+    static const std::array<double, 2> allowedValues = {
+        1, 2
+    };
+
+    if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) {
+		m_PaymentMethod = value;
+	} else {
+		throw std::runtime_error("Value " + boost::lexical_cast<std::string>(value) + " not allowed");
+	}
+}
+
+
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json)
 {
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
index eccfec8de093..e58f70608637 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
@@ -94,6 +94,12 @@ class  Order
     bool isComplete() const;
     void setComplete(bool value);
 
+    /// <summary>
+    /// Various payment methods
+    /// </summary>
+    double getPaymentMethod() const;
+    void setPaymentMethod(double value);
+
 protected:
     int64_t m_Id = 0L;
     int64_t m_PetId = 0L;
@@ -101,6 +107,7 @@ class  Order
     std::string m_ShipDate = "";
     std::string m_Status = "";
     bool m_Complete = false;
+    double m_PaymentMethod = 1;
 };
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json);
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
index 1aa25d3ed5e5..869cd1344242 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
@@ -118,7 +118,7 @@ public interface FakeService {
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray, @FormParam(value = "enum_form_string")  String enumFormString);
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray, @FormParam(value = "enum_form_string")  String enumFormString, @FormParam(value = "enum_form_integer")  Integer enumFormInteger, @FormParam(value = "enum_form_double")  BigDecimal enumFormDouble);
 
     @DELETE
     void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group") @NotNull  Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index f0cafc0644da..32e0432ed636 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -149,7 +149,7 @@ public void testEndpointParameters(@FormParam(value = "number")  BigDecimal numb
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
-    public void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString) {
+    public void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString,@FormParam(value = "enum_form_integer")  Integer enumFormInteger,@FormParam(value = "enum_form_double")  BigDecimal enumFormDouble) {
     }
 
     @DELETE
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
index 707cdd3797f9..467e2764f9d7 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,6 +14,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -88,6 +89,58 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -208,6 +261,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -223,6 +296,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..7c9e262257fc 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,44 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
     /**
      * Default constructor.
      */
@@ -71,6 +110,7 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -78,7 +118,8 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +127,7 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
     }
 
 
@@ -162,6 +204,18 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +230,7 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
index bcac9cd0ce59..5f9d7297f232 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
@@ -119,7 +119,7 @@ public interface FakeService {
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray, @FormParam(value = "enum_form_string")  String enumFormString);
+    void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray, @HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray, @FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray, @FormParam(value = "enum_form_string")  String enumFormString, @FormParam(value = "enum_form_integer")  Integer enumFormInteger, @FormParam(value = "enum_form_double")  BigDecimal enumFormDouble);
 
     @DELETE
     void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group") @NotNull  Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group")  Boolean booleanGroup, @QueryParam("int64_group") Long int64Group);
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index 0080152ec12c..f09d2349ff3e 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -150,7 +150,7 @@ public void testEndpointParameters(@FormParam(value = "number")  BigDecimal numb
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
-    public void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString) {
+    public void testEnumParameters(@HeaderParam("enum_header_string_array")  List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")  @DefaultValue("-efg") String enumHeaderString,@QueryParam("enum_query_string_array") List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString,@QueryParam("enum_query_integer") Integer enumQueryInteger,@QueryParam("enum_query_double") Double enumQueryDouble,@QueryParam("enum_query_model_array") List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString,@FormParam(value = "enum_form_integer")  Integer enumFormInteger,@FormParam(value = "enum_form_double")  BigDecimal enumFormDouble) {
     }
 
     @DELETE
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
index 707cdd3797f9..467e2764f9d7 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,6 +14,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -88,6 +89,58 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
  /**
    * Get id
    * @return id
@@ -208,6 +261,26 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -223,6 +296,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java
index 6caa30314595..010b0e2adcee 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java
@@ -682,6 +682,14 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
         // Parameter: enum_form_string
         Optional<String> enumFormString = testEnumParametersOp.enumFormString(request, formParams, validator);
 
+
+        // Parameter: enum_form_integer
+        Optional<Integer> enumFormInteger = testEnumParametersOp.enumFormInteger(request, formParams, validator);
+
+
+        // Parameter: enum_form_double
+        Optional<BigDecimal> enumFormDouble = testEnumParametersOp.enumFormDouble(request, formParams, validator);
+
         validator.execute();
 
         handleTestEnumParameters(request, response, 
@@ -693,7 +701,9 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
                     enumQueryDouble, 
                     enumQueryModelArray, 
                     enumFormStringArray, 
-                    enumFormString);
+                    enumFormString, 
+                    enumFormInteger, 
+                    enumFormDouble);
     }
 
     /**
@@ -710,6 +720,8 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
      * @param enumQueryModelArray enumQueryModelArray 
      * @param enumFormStringArray Form parameter enum test (string array) 
      * @param enumFormString Form parameter enum test (string) 
+     * @param enumFormInteger Form parameter enum test (integer) 
+     * @param enumFormDouble Form parameter enum test (double) 
      */
     protected abstract void handleTestEnumParameters(ServerRequest request, ServerResponse response, 
                 List<String> enumHeaderStringArray, 
@@ -720,7 +732,9 @@ protected abstract void handleTestEnumParameters(ServerRequest request, ServerRe
                 Optional<Double> enumQueryDouble, 
                 List<EnumClass> enumQueryModelArray, 
                 List<String> enumFormStringArray, 
-                Optional<String> enumFormString);
+                Optional<String> enumFormString, 
+                Optional<Integer> enumFormInteger, 
+                Optional<BigDecimal> enumFormDouble);
 
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional).
@@ -2983,6 +2997,47 @@ protected Optional<String> enumFormString(ServerRequest request, Parameters form
                              "(xyz)")));
         }
 
+        /**
+         * Prepares the enumFormInteger parameter.
+         *
+         * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter
+         * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation
+         * @return enumFormInteger parameter value
+         */
+        protected Optional<Integer> enumFormInteger(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) {
+            return formParams
+                .first("enum_form_integer")
+                .asOptional()
+                .or(() -> Optional.of("1"))
+                .map(Integer::valueOf)
+                .map(v -> validator.check("enum_form_integer",
+                     v,
+                     List.of(1,
+                             -1,
+                             0)));
+        }
+
+        /**
+         * Prepares the enumFormDouble parameter.
+         *
+         * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter
+         * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation
+         * @return enumFormDouble parameter value
+         */
+        protected Optional<BigDecimal> enumFormDouble(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) {
+            return formParams
+                .first("enum_form_double")
+                .asOptional()
+                .or(() -> Optional.of("1.1"))
+                .map(BigDecimal::new)
+                .map(v -> validator.check("enum_form_double",
+                     v,
+                     List.of(new BigDecimal("1.1"),
+                             new BigDecimal("-1.1"),
+                             new BigDecimal("0.1"),
+                             new BigDecimal("0.0"))));
+        }
+
         /**
          * Response for HTTP status code {@code 400}.
          */
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index e47df278f682..6fc2ef7e47e9 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -165,7 +165,9 @@ protected void handleTestEnumParameters(ServerRequest request, ServerResponse re
                 Optional<Double> enumQueryDouble, 
                 List<EnumClass> enumQueryModelArray, 
                 List<String> enumFormStringArray, 
-                Optional<String> enumFormString) {
+                Optional<String> enumFormString, 
+                Optional<Integer> enumFormInteger, 
+                Optional<BigDecimal> enumFormDouble) {
 
         response.status(Status.NOT_IMPLEMENTED_501).send();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..7c9e262257fc 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,44 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
     /**
      * Default constructor.
      */
@@ -71,6 +110,7 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -78,7 +118,8 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +127,7 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
     }
 
 
@@ -162,6 +204,18 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +230,7 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java
index a308fb480027..85fa383ac755 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java
@@ -678,6 +678,14 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
         // Parameter: enum_form_string
         Optional<String> enumFormString = testEnumParametersOp.enumFormString(request, formParams, validator);
 
+
+        // Parameter: enum_form_integer
+        Optional<Integer> enumFormInteger = testEnumParametersOp.enumFormInteger(request, formParams, validator);
+
+
+        // Parameter: enum_form_double
+        Optional<BigDecimal> enumFormDouble = testEnumParametersOp.enumFormDouble(request, formParams, validator);
+
         validator.execute();
 
         handleTestEnumParameters(request, response, 
@@ -689,7 +697,9 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
                     enumQueryDouble, 
                     enumQueryModelArray, 
                     enumFormStringArray, 
-                    enumFormString);
+                    enumFormString, 
+                    enumFormInteger, 
+                    enumFormDouble);
     }
 
     /**
@@ -706,6 +716,8 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response
      * @param enumQueryModelArray enumQueryModelArray 
      * @param enumFormStringArray Form parameter enum test (string array) 
      * @param enumFormString Form parameter enum test (string) 
+     * @param enumFormInteger Form parameter enum test (integer) 
+     * @param enumFormDouble Form parameter enum test (double) 
      */
     protected abstract void handleTestEnumParameters(ServerRequest request, ServerResponse response, 
                 List<String> enumHeaderStringArray, 
@@ -716,7 +728,9 @@ protected abstract void handleTestEnumParameters(ServerRequest request, ServerRe
                 Optional<Double> enumQueryDouble, 
                 List<EnumClass> enumQueryModelArray, 
                 List<String> enumFormStringArray, 
-                Optional<String> enumFormString);
+                Optional<String> enumFormString, 
+                Optional<Integer> enumFormInteger, 
+                Optional<BigDecimal> enumFormDouble);
 
     /**
      * DELETE /fake : Fake endpoint to test group parameters (optional).
@@ -2931,6 +2945,47 @@ protected Optional<String> enumFormString(ServerRequest request, Parameters form
                              "(xyz)")));
         }
 
+        /**
+         * Prepares the enumFormInteger parameter.
+         *
+         * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter
+         * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation
+         * @return enumFormInteger parameter value
+         */
+        protected Optional<Integer> enumFormInteger(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) {
+            return formParams
+                .first("enum_form_integer")
+                .asOptional()
+                .or(() -> Optional.of("1"))
+                .map(Integer::valueOf)
+                .map(v -> validator.check("enum_form_integer",
+                     v,
+                     List.of(1,
+                             -1,
+                             0)));
+        }
+
+        /**
+         * Prepares the enumFormDouble parameter.
+         *
+         * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter
+         * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation
+         * @return enumFormDouble parameter value
+         */
+        protected Optional<BigDecimal> enumFormDouble(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) {
+            return formParams
+                .first("enum_form_double")
+                .asOptional()
+                .or(() -> Optional.of("1.1"))
+                .map(BigDecimal::new)
+                .map(v -> validator.check("enum_form_double",
+                     v,
+                     List.of(new BigDecimal("1.1"),
+                             new BigDecimal("-1.1"),
+                             new BigDecimal("0.1"),
+                             new BigDecimal("0.0"))));
+        }
+
         /**
          * Response for HTTP status code {@code 400}.
          */
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index 012b7789b1b5..dda18ca2010b 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -163,7 +163,9 @@ protected void handleTestEnumParameters(ServerRequest request, ServerResponse re
                 Optional<Double> enumQueryDouble, 
                 List<EnumClass> enumQueryModelArray, 
                 List<String> enumFormStringArray, 
-                Optional<String> enumFormString) {
+                Optional<String> enumFormString, 
+                Optional<Integer> enumFormInteger, 
+                Optional<BigDecimal> enumFormDouble) {
 
         response.status(Status.NOT_IMPLEMENTED_501).send();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..7c9e262257fc 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,44 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
     /**
      * Default constructor.
      */
@@ -71,6 +110,7 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -78,7 +118,8 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +127,7 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
     }
 
 
@@ -162,6 +204,18 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +230,7 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..7c9e262257fc 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,44 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
     /**
      * Default constructor.
      */
@@ -71,6 +110,7 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -78,7 +118,8 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +127,7 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
     }
 
 
@@ -162,6 +204,18 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +230,7 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
index 71ba74eeb055..050ac62d0522 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
@@ -1438,6 +1438,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1466,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2217,6 +2230,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
index 63db2d67efbb..a031cdc95e9c 100644
--- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
+++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
@@ -574,7 +574,7 @@ public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.N
 
 
 
-    public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString) {
+    public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble) {
         MappingBuilder stub = get(urlPathEqualTo("/fake"))
             .willReturn(aResponse()
                 .withStatus(400)
@@ -601,6 +601,12 @@ public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullabl
         if(enumFormString != null) {
             stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString));
         }
+        if(enumFormInteger != null) {
+            stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger));
+        }
+        if(enumFormDouble != null) {
+            stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble));
+        }
         if(enumHeaderStringArray != null) {
             stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray));
         }
@@ -611,7 +617,7 @@ public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullabl
         return stub;
     }
 
-    public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString) {
+    public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble) {
         MappingBuilder stub = get(urlPathEqualTo("/fake"))
             .willReturn(aResponse()
                 .withStatus(404)
@@ -638,6 +644,12 @@ public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullabl
         if(enumFormString != null) {
             stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString));
         }
+        if(enumFormInteger != null) {
+            stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger));
+        }
+        if(enumFormDouble != null) {
+            stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble));
+        }
         if(enumHeaderStringArray != null) {
             stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray));
         }
@@ -648,7 +660,7 @@ public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullabl
         return stub;
     }
 
-    public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, Fault fault) {
+    public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble, Fault fault) {
         MappingBuilder stub = get(urlPathEqualTo("/fake"))
             .willReturn(aResponse()
                 .withFault(fault)
@@ -675,6 +687,12 @@ public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nulla
         if(enumFormString != null) {
             stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString));
         }
+        if(enumFormInteger != null) {
+            stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger));
+        }
+        if(enumFormDouble != null) {
+            stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble));
+        }
         if(enumHeaderStringArray != null) {
             stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray));
         }
diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
index 20c5aa09078a..c4dce1da28c8 100644
--- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
+++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
@@ -131,10 +131,10 @@ public static MappingBuilder stubGetOrderByIdFault(@javax.annotation.Nonnull Str
     }
 
     public static String getOrderById200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String getOrderById200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> </Order>";
     }
 
 
@@ -180,14 +180,14 @@ public static MappingBuilder stubPlaceOrderFault(@javax.annotation.Nonnull Strin
     }
 
     public static String placeOrder200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String placeOrder200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> </Order>";
     }
 
     public static String placeOrderRequestSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
 
 
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
index ff7a5581fc4a..fa60757c71df 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
@@ -252,9 +252,9 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true)
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class)
     })
-    public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array")  List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string")  String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer")  Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double")  Double enumQueryDouble,@ApiParam(value = "") @QueryParam("enum_query_model_array")  List<EnumClass> enumQueryModelArray,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$")  @DefaultValue("$") @FormParam("enum_form_string_array")  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")  @DefaultValue("-efg") @FormParam("enum_form_string")  String enumFormString,@Context SecurityContext securityContext)
+    public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array")  List<String> enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string")  String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer")  Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double")  Double enumQueryDouble,@ApiParam(value = "") @QueryParam("enum_query_model_array")  List<EnumClass> enumQueryModelArray,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$")  @DefaultValue("$") @FormParam("enum_form_string_array")  List<String> enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")  @DefaultValue("-efg") @FormParam("enum_form_string")  String enumFormString,@ApiParam(value = "Form parameter enum test (integer)", allowableValues="1, -1, 0", defaultValue="1")  @DefaultValue("1") @FormParam("enum_form_integer")  Integer enumFormInteger,@ApiParam(value = "Form parameter enum test (double)", allowableValues="1.1, -1.1, 0.1, 0.0", defaultValue="1.1")  @DefaultValue("1.1") @FormParam("enum_form_double")  BigDecimal enumFormDouble,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, securityContext);
+        return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, securityContext);
     }
     @javax.ws.rs.DELETE
     
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
index 72452f9f36ee..ed62b838d560 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -46,7 +46,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,Integer enumFormInteger,BigDecimal enumFormDouble,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineFreeformAdditionalProperties(TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest,SecurityContext securityContext) throws NotFoundException;
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 f876902045ff..8cc6c9ad7c73 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
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import javax.validation.constraints.*;
@@ -33,7 +34,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -98,6 +100,41 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -218,6 +255,26 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(value = "paymentMethod")
+  @ApiModelProperty(example = "1", value = "Various payment methods")
+  
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -233,12 +290,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -252,6 +310,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index ff179e81f03e..5e51a01b6f63 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -102,7 +102,7 @@ public Response testEndpointParameters(BigDecimal number, Double _double, String
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, SecurityContext securityContext) throws NotFoundException {
+    public Response testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
index 6382b000e723..efa8cc2e78cf 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
@@ -313,7 +313,7 @@ public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal
                 
             })
         })
-    public Response testEnumParameters(@HeaderParam("enum_header_string_array")   @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Header parameter enum test (string array)") List<String> enumHeaderStringArray,@QueryParam("enum_query_string_array")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)")  Integer enumQueryInteger,@QueryParam("enum_query_double")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)")  Double enumQueryDouble,@QueryParam("enum_query_model_array")   List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString) {
+    public Response testEnumParameters(@HeaderParam("enum_header_string_array")   @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Header parameter enum test (string array)") List<String> enumHeaderStringArray,@QueryParam("enum_query_string_array")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)")  Integer enumQueryInteger,@QueryParam("enum_query_double")  @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)")  Double enumQueryDouble,@QueryParam("enum_query_model_array")   List<EnumClass> enumQueryModelArray,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString,@FormParam(value = "enum_form_integer")  Integer enumFormInteger,@FormParam(value = "enum_form_double")  BigDecimal enumFormDouble) {
         return Response.ok().entity("magic!").build();
     }
 
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
index 64044f795460..1d71aad52207 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,6 @@
 package org.openapitools.model;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import javax.validation.constraints.*;
@@ -70,6 +71,54 @@ public static StatusEnum fromValue(String value) {
 
   private StatusEnum status;
   private Boolean complete = false;
+  public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
 
   protected Order(OrderBuilder<?, ?> b) {
     this.id = b.id;
@@ -78,6 +127,7 @@ protected Order(OrderBuilder<?, ?> b) {
     this.shipDate = b.shipDate;
     this.status = b.status;
     this.complete = b.complete;
+    this.paymentMethod = b.paymentMethod;
   }
 
   public Order() {
@@ -198,6 +248,26 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  /**
+   * Various payment methods
+   **/
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  
+  @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1", description = "Various payment methods")
+  @JsonProperty("paymentMethod")
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  @JsonProperty("paymentMethod")
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -213,12 +283,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -232,6 +303,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -272,6 +344,7 @@ public static abstract class OrderBuilder<C extends Order, B extends OrderBuilde
     private LocalDateTime shipDate;
     private StatusEnum status;
     private Boolean complete = false;
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
     protected abstract B self();
 
     public abstract C build();
@@ -300,6 +373,10 @@ public B complete(Boolean complete) {
       this.complete = complete;
       return self();
     }
+    public B paymentMethod(PaymentMethodEnum paymentMethod) {
+      this.paymentMethod = paymentMethod;
+      return self();
+    }
   }
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
index 81900f211c15..1ec770aa1ea8 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
@@ -1528,6 +1528,7 @@ components:
       example:
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1555,6 +1556,18 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
       type: object
       xml:
         name: Order
@@ -2307,6 +2320,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
index b9683ce1b49d..1a61d5635db6 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
@@ -261,9 +261,9 @@ public Response testEndpointParameters(@Schema(description = "None") @FormParam(
             @ApiResponse(responseCode = "404", description = "Not found", content = 
                 @Content(schema = @Schema(implementation = Void.class))),
             }, tags={ "fake", }) 
-    public Response testEnumParameters(@Schema(description = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@Schema(description = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@Schema(description = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array")  List<String> enumQueryStringArray,@Schema(description = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string")  String enumQueryString,@Schema(description = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer")  Integer enumQueryInteger,@Schema(description = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double")  Double enumQueryDouble,@Schema(description = "") @QueryParam("enum_query_model_array")  List<EnumClass> enumQueryModelArray,@Schema(description = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List<String> enumFormStringArray,@Schema(description = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@Context SecurityContext securityContext)
+    public Response testEnumParameters(@Schema(description = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray,@Schema(description = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@Schema(description = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array")  List<String> enumQueryStringArray,@Schema(description = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string")  String enumQueryString,@Schema(description = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer")  Integer enumQueryInteger,@Schema(description = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double")  Double enumQueryDouble,@Schema(description = "") @QueryParam("enum_query_model_array")  List<EnumClass> enumQueryModelArray,@Schema(description = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List<String> enumFormStringArray,@Schema(description = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@Schema(description = "Form parameter enum test (integer)", allowableValues="1, -1, 0", defaultValue="1") @DefaultValue("1") @FormParam("enum_form_integer") Integer enumFormInteger,@Schema(description = "Form parameter enum test (double)", allowableValues="1.1, -1.1, 0.1, 0.0", defaultValue="1.1") @DefaultValue("1.1") @FormParam("enum_form_double") BigDecimal enumFormDouble,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, securityContext);
+        return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, securityContext);
     }
 
     @jakarta.ws.rs.DELETE
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
index 16dfa07d79a9..59b29822b4ca 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -46,7 +46,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,Integer enumFormInteger,BigDecimal enumFormDouble,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineFreeformAdditionalProperties(TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest,SecurityContext securityContext) throws NotFoundException;
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 5c96be8e0b05..35739f481fe0 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
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import jakarta.validation.constraints.*;
@@ -32,7 +33,8 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -97,6 +99,41 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -217,6 +254,26 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(value = "paymentMethod")
+  @Schema(example = "1", description = "Various payment methods")
+  
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -232,12 +289,13 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
   }
 
   @Override
@@ -251,6 +309,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index a9985f0cf43b..e48197f25c2f 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -102,7 +102,7 @@ public Response testEndpointParameters(BigDecimal number, Double _double, String
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, SecurityContext securityContext) throws NotFoundException {
+    public Response testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 0766ce49b8a4..2ae10f3f0f54 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -60,6 +60,7 @@ Model/NullableClass.php
 Model/NumberOnly.php
 Model/ObjectWithDeprecatedFields.php
 Model/Order.php
+Model/OrderPaymentMethod.php
 Model/OrderStatus.php
 Model/OuterComposite.php
 Model/OuterEnum.php
@@ -78,6 +79,8 @@ Model/Tag.php
 Model/TestEnumParametersEnumHeaderStringParameter.php
 Model/TestEnumParametersEnumQueryDoubleParameter.php
 Model/TestEnumParametersEnumQueryIntegerParameter.php
+Model/TestEnumParametersRequestEnumFormDouble.php
+Model/TestEnumParametersRequestEnumFormInteger.php
 Model/TestEnumParametersRequestEnumFormString.php
 Model/TestEnumParametersRequestEnumFormStringArrayInner.php
 Model/TestInlineFreeformAdditionalPropertiesRequest.php
diff --git a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
index 0ba584fe917a..497f170758ef 100644
--- a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
+++ b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php
@@ -244,6 +244,8 @@ public function testEndpointParameters(
      * @param null | \OpenAPI\Server\Model\EnumClass[] $enumQueryModelArray
      * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumFormStringArray
      * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumFormString
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger $enumFormInteger
+     * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble $enumFormDouble
      * @return \OpenAPI\Server\Model\NoContent400 | \OpenAPI\Server\Model\NoContent404
      */
     public function testEnumParameters(
@@ -256,6 +258,8 @@ public function testEnumParameters(
             ?array $enumQueryModelArray,
             ?array $enumFormStringArray,
             ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumFormString,
+            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger $enumFormInteger,
+            ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble $enumFormDouble,
     ):
         \OpenAPI\Server\Model\NoContent400 | 
         \OpenAPI\Server\Model\NoContent404
diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
index e8577b7ee8b7..5e3ffb108629 100644
--- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php
@@ -739,6 +739,10 @@ public function testEnumParameters(Request $request): JsonResponse
                 ],
                 'enumFormString' => [
                 ],
+                'enumFormInteger' => [
+                ],
+                'enumFormDouble' => [
+                ],
             ],
         );
 
@@ -764,8 +768,12 @@ public function testEnumParameters(Request $request): JsonResponse
 
         $enumFormString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class);
 
+        $enumFormInteger = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger::class);
+
+        $enumFormDouble = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble::class);
+
         try {
-            $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString);
+            $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString, $enumFormInteger, $enumFormDouble);
         } catch (\Exception $exception) {
             // This shouldn't happen
             report($exception);
diff --git a/samples/server/petstore/php-laravel/Model/Order.php b/samples/server/petstore/php-laravel/Model/Order.php
index 4a9f2eb3d572..b4e58a774d1e 100644
--- a/samples/server/petstore/php-laravel/Model/Order.php
+++ b/samples/server/petstore/php-laravel/Model/Order.php
@@ -51,6 +51,9 @@ class Order
     *
     * 
     * @param bool $complete
+    *
+    * 
+    * @param \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod
     */
 
     public function __construct(
@@ -60,6 +63,7 @@ public function __construct(
         public \DateTime $shipDate,
         public \OpenAPI\Server\Model\OrderStatus $status,
         public bool $complete = false,
+        public \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod,
     ) {}
 }
 
diff --git a/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php b/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php
new file mode 100644
index 000000000000..3e168094a551
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * OrderPaymentMethod
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * OrderPaymentMethod
+ * @description Various payment methods
+ */
+enum OrderPaymentMethod: float
+{
+        case NUMBER_1 = 1;
+        case NUMBER_2 = 2;
+}
diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php
new file mode 100644
index 000000000000..47d6def4d43c
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * TestEnumParametersRequestEnumFormDouble
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * TestEnumParametersRequestEnumFormDouble
+ * @description Form parameter enum test (double)
+ */
+enum TestEnumParametersRequestEnumFormDouble: float
+{
+        case NUMBER_1_DOT_1 = 1.1;
+        case MINUS_1_DOT_1 = -1.1;
+        case NUMBER_0_DOT_1 = 0.1;
+        case NUMBER_0_DOT_0 = 0.0;
+}
diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php
new file mode 100644
index 000000000000..4cbc21ceca31
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * TestEnumParametersRequestEnumFormInteger
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * TestEnumParametersRequestEnumFormInteger
+ * @description Form parameter enum test (integer)
+ */
+enum TestEnumParametersRequestEnumFormInteger: int
+{
+        case NUMBER_1 = 1;
+        case MINUS_1 = -1;
+        case NUMBER_0 = 0;
+}
diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
index 984dd7ac20b9..e77adf94ff79 100644
--- a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
+++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
@@ -183,6 +183,10 @@ public function testEnumParameters()
 
         $enum_form_string = $input['enum_form_string'];
 
+        $enum_form_integer = $input['enum_form_integer'];
+
+        $enum_form_double = $input['enum_form_double'];
+
 
         return response('How about implementing testEnumParameters as a get method ?');
     }

From 9778e8fa7c93b305d426e9947180f4055e644a77 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Tue, 28 Jan 2025 17:50:42 +0100
Subject: [PATCH 07/22] don't trigger unrelated problem

---
 ...th-fake-endpoints-models-for-testing-okhttp-gson.yaml | 9 ---------
 .../client/petstore/java/okhttp-gson/api/openapi.yaml    | 9 ---------
 samples/client/petstore/java/okhttp-gson/docs/FakeApi.md | 6 ++----
 .../java/org/openapitools/client/api/FakeApiTest.java    | 4 +---
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
index 04cd554627d6..e82996591dcb 100644
--- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml
@@ -689,15 +689,6 @@ paths:
                     - -1
                     - 0
                   default: 1
-                enum_form_double:
-                  description: Form parameter enum test (double)
-                  type: number
-                  enum:
-                    - 1.1
-                    - -1.1
-                    - 0.1
-                    - 0.0
-                  default: 1.1
     post:
       tags:
         - fake
diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
index fc1639b2ddb2..fde6e8b9f01f 100644
--- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
+++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml
@@ -2984,15 +2984,6 @@ components:
           - -1
           - 0
           type: integer
-        enum_form_double:
-          default: 1.1
-          description: Form parameter enum test (double)
-          enum:
-          - 1.1
-          - -1.1
-          - 0.1
-          - 0.0
-          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index 90eb140aac25..0181d0b4dd20 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -982,7 +982,7 @@ null (empty response body)
 
 <a id="testEnumParameters"></a>
 # **testEnumParameters**
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger)
 
 To test enum parameters
 
@@ -1012,9 +1012,8 @@ public class Example {
     List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
     String enumFormString = "_abc"; // String | Form parameter enum test (string)
     Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
-    BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
     try {
-      apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+      apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
     } catch (ApiException e) {
       System.err.println("Exception when calling FakeApi#testEnumParameters");
       System.err.println("Status code: " + e.getCode());
@@ -1039,7 +1038,6 @@ public class Example {
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
 | **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
-| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index bc2512b5ba66..d02ae0d2a053 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -264,9 +264,7 @@ public void testEnumParametersTest() throws ApiException {
         Double enumQueryDouble = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        Integer enumFormInteger = null;
-        Double enumFormDouble = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
         // TODO: test validations
     }
 

From bd0254e985a262b03ff4e55443d83f0f040622ce Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 8 Apr 2025 14:23:37 +0200
Subject: [PATCH 08/22] Generate samples

---
 .../org/openapitools/client/api/FakeApi.java  | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
index f0b6f952bd50..a86cc2601198 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -2109,7 +2109,6 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @param _callback Callback for upload/download progress
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
@@ -2121,7 +2120,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -2158,10 +2157,6 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<Strin
             localVarFormParams.put("enum_form_integer", enumFormInteger);
         }
 
-        if (enumFormDouble != null) {
-            localVarFormParams.put("enum_form_double", enumFormDouble);
-        }
-
         if (enumQueryStringArray != null) {
             localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray));
         }
@@ -2208,8 +2203,8 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List<Strin
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
-        return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
+    private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, final ApiCallback _callback) throws ApiException {
+        return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback);
 
     }
 
@@ -2225,7 +2220,6 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table border="1">
@@ -2235,8 +2229,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
-        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+    public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger) throws ApiException {
+        testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
     }
 
     /**
@@ -2251,7 +2245,6 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @return ApiResponse&lt;Void&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
@@ -2262,8 +2255,8 @@ public void testEnumParameters(@javax.annotation.Nullable List<String> enumHeade
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException {
-        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null);
+    public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger) throws ApiException {
+        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, null);
         return localVarApiClient.execute(localVarCall);
     }
 
@@ -2279,7 +2272,6 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
      * @param enumFormStringArray Form parameter enum test (string array) (optional)
      * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
      * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
-     * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -2291,9 +2283,9 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(@javax.annotation.Nullab
         <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
+        okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }

From 73381dfb590da8cd3a71ddf194668a4cf1d05fb1 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:55:05 +0100
Subject: [PATCH 09/22] update all samples

---
 .../openapitools/client/ApiClientTest.java    | 350 -----------
 .../org/openapitools/client/ClientTest.java   |  70 ---
 .../client/ConfigurationTest.java             |  15 -
 .../openapitools/client/StringUtilTest.java   |  33 -
 .../openapitools/client/api/FakeApiTest.java  |   3 +-
 .../openapitools/client/api/PetApiTest.java   | 594 ------------------
 .../client/auth/ApiKeyAuthTest.java           | 119 ----
 .../client/auth/HttpBasicAuthTest.java        |  65 --
 .../client/auth/RetryingOAuthTest.java        | 124 ----
 ...OfModelArrayAnyOfAllOfAttributesCTest.java |   9 +
 .../openapitools/client/model/OrderTest.java  |   9 +
 .../openapitools/client/model/PetTest.java    |  92 ---
 12 files changed, 20 insertions(+), 1463 deletions(-)
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
 delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java

diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
deleted file mode 100644
index 05c47e82206e..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package org.openapitools.client;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.*;
-
-import okhttp3.OkHttpClient;
-import org.junit.jupiter.api.*;
-import org.openapitools.client.auth.*;
-
-public class ApiClientTest {
-    ApiClient apiClient;
-    JSON json;
-
-    @BeforeEach
-    public void setup() {
-        apiClient = new ApiClient();
-        json = apiClient.getJSON();
-    }
-
-    @Test
-    public void testIsJsonMime() {
-        assertFalse(apiClient.isJsonMime(null));
-        assertFalse(apiClient.isJsonMime(""));
-        assertFalse(apiClient.isJsonMime("text/plain"));
-        assertFalse(apiClient.isJsonMime("application/xml"));
-        assertFalse(apiClient.isJsonMime("application/jsonp"));
-        assertFalse(apiClient.isJsonMime("example/json"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
-
-        assertTrue(apiClient.isJsonMime("application/json"));
-        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/problem+json"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
-        assertTrue(apiClient.isJsonMime("application/json\t"));
-        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
-        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
-        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
-        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/json-patch+json"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals(
-                "application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertNull(apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    /*
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-    */
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testGetAndSetConnectTimeout() {
-        // connect timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getConnectTimeout());
-        assertEquals(10000, apiClient.getHttpClient().connectTimeoutMillis());
-
-        apiClient.setConnectTimeout(0);
-        assertEquals(0, apiClient.getConnectTimeout());
-        assertEquals(0, apiClient.getHttpClient().connectTimeoutMillis());
-
-        apiClient.setConnectTimeout(10000);
-    }
-
-    @Test
-    public void testGetAndSetReadTimeout() {
-        // read timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getReadTimeout());
-        assertEquals(10000, apiClient.getHttpClient().readTimeoutMillis());
-
-        apiClient.setReadTimeout(0);
-        assertEquals(0, apiClient.getReadTimeout());
-        assertEquals(0, apiClient.getHttpClient().readTimeoutMillis());
-
-        apiClient.setReadTimeout(10000);
-    }
-
-    @Test
-    public void testGetAndSetWriteTimeout() {
-        // write timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getWriteTimeout());
-        assertEquals(10000, apiClient.getHttpClient().writeTimeoutMillis());
-
-        apiClient.setWriteTimeout(0);
-        assertEquals(0, apiClient.getWriteTimeout());
-        assertEquals(0, apiClient.getHttpClient().writeTimeoutMillis());
-
-        apiClient.setWriteTimeout(10000);
-    }
-
-    @Test
-    public void testParameterToPairWhenNameIsInvalid() throws Exception {
-        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
-        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
-        // single empty string
-        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
-        assertEquals(1, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        List<Pair> pairs = apiClient.parameterToPair(name, value);
-
-        assertEquals(1, pairs.size());
-        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsCollection() throws Exception {
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
-        assertEquals(0, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
-        List<Integer> objects = new ArrayList<Integer>();
-        objects.add(new Integer(1));
-
-        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
-        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
-
-        assertEquals(1, concatStrings.size());
-        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsCollection() throws Exception {
-        Map<String, String> collectionFormatMap = new HashMap<String, String>();
-        collectionFormatMap.put("csv", ",");
-        collectionFormatMap.put("tsv", "\t");
-        collectionFormatMap.put("ssv", " ");
-        collectionFormatMap.put("pipes", "|");
-        collectionFormatMap.put("", ","); // no format, must default to csv
-        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
-        assertEquals(values.size(), multiPairs.size());
-        for (int i = 0; i < values.size(); i++) {
-            assertEquals(
-                    apiClient.escapeString(apiClient.parameterToString(values.get(i))),
-                    multiPairs.get(i).getValue());
-        }
-
-        // all other formats
-        for (String collectionFormat : collectionFormatMap.keySet()) {
-            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            if (!delimiter.equals(",")) {
-                // commas are not escaped because they are reserved characters in URIs
-                delimiter = apiClient.escapeString(delimiter);
-            }
-            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
-
-            // must equal input values
-            assertEquals(values.size(), pairValueSplit.length);
-            for (int i = 0; i < values.size(); i++) {
-                assertEquals(
-                        apiClient.escapeString(apiClient.parameterToString(values.get(i))),
-                        pairValueSplit[i]);
-            }
-        }
-    }
-
-    @Test
-    public void testSanitizeFilename() {
-        assertEquals("sun", apiClient.sanitizeFilename("sun"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
-    }
-
-    @Test
-    public void testNewHttpClient() {
-        OkHttpClient oldClient = apiClient.getHttpClient();
-        apiClient.setHttpClient(oldClient.newBuilder().build());
-        assertNotSame(apiClient.getHttpClient(), oldClient);
-    }
-
-    /**
-     * Tests the invariant that the HttpClient for the ApiClient must never be null
-     */
-    @Test
-    public void testNullHttpClient() {
-        NullPointerException thrown = Assertions.assertThrows(NullPointerException.class, () -> {
-            apiClient.setHttpClient(null);
-        });
-        Assertions.assertEquals("HttpClient must not be null!", thrown.getMessage());
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
deleted file mode 100644
index b8ca4aff421e..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.openapitools.client;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.*;
-
-import okhttp3.OkHttpClient;
-import org.junit.jupiter.api.*;
-import org.openapitools.client.auth.*;
-
-import java.math.BigDecimal;
-
-import org.openapitools.client.model.*;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class ClientTest {
-    ApiClient apiClient;
-    JSON json;
-
-    @BeforeEach
-    public void setup() {
-        apiClient = new ApiClient();
-        json = apiClient.getJSON();
-    }
-
-    /**
-     * Test the property 'arrayArrayNumber'
-     */
-    @Test
-    public void arrayArrayNumberTest() {
-        ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
-        BigDecimal b1 = new BigDecimal("12.3");
-        BigDecimal b2 = new BigDecimal("5.6");
-        List<BigDecimal> arrayArrayNumber = new ArrayList<BigDecimal>();
-        arrayArrayNumber.add(b1);
-        arrayArrayNumber.add(b2);
-        model.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
-        model.getArrayArrayNumber().add(arrayArrayNumber);
-
-        // create another instance for comparison
-        BigDecimal b3 = new BigDecimal("12.3");
-        BigDecimal b4 = new BigDecimal("5.6");
-        ArrayOfArrayOfNumberOnly model2 = new ArrayOfArrayOfNumberOnly();
-        List<BigDecimal> arrayArrayNumber2 = new ArrayList<BigDecimal>();
-        arrayArrayNumber2.add(b1);
-        arrayArrayNumber2.add(b2);
-        model2.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
-        model2.getArrayArrayNumber().add(arrayArrayNumber2);
-
-        Assertions.assertTrue(model2.equals(model));
-    }
-
-    /**
-     * Model tests for Pet
-     */
-    @Test
-    public void testPet() {
-        Pet model = new Pet();
-        // test Pet
-        model.setId(1029L);
-        model.setName("Dog");
-
-        Pet model2 = new Pet();
-        model2.setId(1029L);
-        model2.setName("Dog");
-
-        Assertions.assertTrue(model.equals(model2));
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
deleted file mode 100644
index e5b9d146a4eb..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.openapitools.client;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.*;
-
-public class ConfigurationTest {
-    @Test
-    public void testDefaultApiClient() {
-        ApiClient apiClient = Configuration.getDefaultApiClient();
-        assertNotNull(apiClient);
-        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
-        assertFalse(apiClient.isDebugging());
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
deleted file mode 100644
index c946674e470a..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.openapitools.client;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import org.junit.jupiter.api.*;
-
-public class StringUtilTest {
-    @Test
-    public void testContainsIgnoreCase() {
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
-
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
-    }
-
-    @Test
-    public void testJoin() {
-        String[] array = {"aa", "bb", "cc"};
-        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
-        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
-        assertEquals("aabbcc", StringUtil.join(array, ""));
-        assertEquals("aa bb cc", StringUtil.join(array, " "));
-        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
-
-        assertEquals("", StringUtil.join(new String[]{}, ","));
-        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index d02ae0d2a053..ab5cc50564f8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -264,7 +264,8 @@ public void testEnumParametersTest() throws ApiException {
         Double enumQueryDouble = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
         // TODO: test validations
     }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
deleted file mode 100644
index 9a9a777af869..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- *
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-package org.openapitools.client.api;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.jupiter.api.*;
-import org.openapitools.client.*;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.auth.*;
-import org.openapitools.client.model.*;
-import org.openapitools.client.model.Pet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * API tests for PetApi
- */
-public class PetApiTest {
-
-    private PetApi api = new PetApi();
-    private final Logger LOG = LoggerFactory.getLogger(PetApiTest.class);
-    // In the circle.yml file, /etc/host is configured with an entry to resolve petstore.swagger.io
-    // to 127.0.0.1
-    private static String basePath = "http://petstore.swagger.io:80/v2";
-
-    @BeforeEach
-    public void setup() {
-        // setup authentication
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
-        apiKeyAuth.setApiKey("special-key");
-        api.getApiClient().setBasePath(basePath);
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
-        assertNotNull(api.getApiClient());
-        assertEquals(basePath, api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-
-        ApiClient oldClient = api.getApiClient();
-
-        ApiClient newClient = new ApiClient();
-        newClient.setVerifyingSsl(true);
-        newClient.setBasePath("http://example.com");
-        newClient.setDebugging(true);
-
-        // set api client via constructor
-        api = new PetApi(newClient);
-        assertNotNull(api.getApiClient());
-        assertEquals("http://example.com", api.getApiClient().getBasePath());
-        assertTrue(api.getApiClient().isDebugging());
-
-        // set api client via setter method
-        api.setApiClient(oldClient);
-        assertNotNull(api.getApiClient());
-        assertEquals(basePath, api.getApiClient().getBasePath());
-        assertFalse(api.getApiClient().isDebugging());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertPetMatches(pet, fetched);
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testCreateAndGetPetWithHttpInfo() throws Exception {
-        Pet pet = createPet();
-        api.addPetWithHttpInfo(pet);
-
-        ApiResponse<Pet> resp = api.getPetByIdWithHttpInfo(pet.getId());
-        assertEquals(200, resp.getStatusCode());
-        assertEquals("application/json", resp.getHeaders().get("Content-Type").get(0));
-        Pet fetched = resp.getData();
-
-        assertPetMatches(pet, fetched);
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testCreateAndGetPetAsync() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-        // to store returned Pet or error message/exception
-        final Map<String, Object> result = new HashMap<String, Object>();
-
-        api.getPetByIdAsync(
-                pet.getId(),
-                new ApiCallback<Pet>() {
-                    @Override
-                    public void onFailure(
-                            ApiException e,
-                            int statusCode,
-                            Map<String, List<String>> responseHeaders) {
-                        result.put("error", e.getMessage());
-                    }
-
-                    @Override
-                    public void onSuccess(
-                            Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                        result.put("pet", pet);
-                    }
-
-                    @Override
-                    public void onUploadProgress(
-                            long bytesWritten, long contentLength, boolean done) {
-                        // empty
-                    }
-
-                    @Override
-                    public void onDownloadProgress(
-                            long bytesRead, long contentLength, boolean done) {
-                        // empty
-                    }
-                });
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        final int maxTry = 10;
-        int tryCount = 1;
-        Pet fetched = null;
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("error") != null) fail((String) result.get("error"));
-            if (result.get("pet") != null) {
-                fetched = (Pet) result.get("pet");
-                break;
-            }
-        } while (result.isEmpty());
-        assertPetMatches(pet, fetched);
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testCreateAndGetPetAsyncInvalidID() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-        // to store returned Pet or error message/exception
-        final Map<String, Object> result = new HashMap<String, Object>();
-
-        // test getting a nonexistent pet
-        result.clear();
-        api.getPetByIdAsync(
-                -10000L,
-                new ApiCallback<Pet>() {
-                    @Override
-                    public void onFailure(
-                            ApiException e,
-                            int statusCode,
-                            Map<String, List<String>> responseHeaders) {
-                        result.put("exception", e);
-                    }
-
-                    @Override
-                    public void onSuccess(
-                            Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
-                        result.put("pet", pet);
-                    }
-
-                    @Override
-                    public void onUploadProgress(
-                            long bytesWritten, long contentLength, boolean done) {
-                        // empty
-                    }
-
-                    @Override
-                    public void onDownloadProgress(
-                            long bytesRead, long contentLength, boolean done) {
-                        // empty
-                    }
-                });
-
-        // wait for the asynchronous call to finish (at most 10 seconds)
-        final int maxTry = 10;
-        int tryCount = 1;
-        Pet fetched = null;
-        ApiException exception = null;
-
-        do {
-            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
-            Thread.sleep(1000);
-            tryCount += 1;
-            if (result.get("pet") != null) fail("expected an error");
-            if (result.get("exception") != null) {
-                exception = (ApiException) result.get("exception");
-                break;
-            }
-        } while (result.isEmpty());
-        assertNotNull(exception);
-        assertEquals(404, exception.getCode());
-        String pattern = "^Message: Not Found\\RHTTP response code: 404\\RHTTP response body: .*\\RHTTP response headers: .*$";
-        assertTrue(exception.getMessage().matches(pattern));
-        assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testCreateAndGetMultiplePetsAsync() throws Exception {
-        Pet pet1 = createPet();
-        Pet pet2 = createPet();
-
-        final CountDownLatch addLatch = new CountDownLatch(2);
-        final TestApiCallback<Void> addCallback1 = new TestApiCallback<Void>(addLatch);
-        final TestApiCallback<Void> addCallback2 = new TestApiCallback<Void>(addLatch);
-
-        // Make 2 simultaneous calls
-        api.addPetAsync(pet1, addCallback1);
-        api.addPetAsync(pet2, addCallback2);
-
-        // wait for both asynchronous calls to finish (at most 10 seconds)
-        assertTrue(addLatch.await(10, TimeUnit.SECONDS));
-
-        assertTrue(addCallback1.isDone());
-        assertTrue(addCallback2.isDone());
-
-        if (!addCallback1.isSuccess()) throw addCallback1.getException();
-        if (!addCallback2.isSuccess()) throw addCallback2.getException();
-
-        assertValidProgress(addCallback1.getUploadProgress());
-        assertValidProgress(addCallback2.getUploadProgress());
-
-        final CountDownLatch getLatch = new CountDownLatch(3);
-        final TestApiCallback<Pet> getCallback1 = new TestApiCallback<Pet>(getLatch);
-        final TestApiCallback<Pet> getCallback2 = new TestApiCallback<Pet>(getLatch);
-        final TestApiCallback<Pet> getCallback3 = new TestApiCallback<Pet>(getLatch);
-
-        api.getPetByIdAsync(pet1.getId(), getCallback1);
-        api.getPetByIdAsync(pet2.getId(), getCallback2);
-        // Get nonexistent pet
-        api.getPetByIdAsync(-10000L, getCallback3);
-
-        // wait for all asynchronous calls to finish (at most 10 seconds)
-        assertTrue(getLatch.await(10, TimeUnit.SECONDS));
-
-        assertTrue(getCallback1.isDone());
-        assertTrue(getCallback2.isDone());
-        assertTrue(getCallback3.isDone());
-
-        if (!getCallback1.isSuccess()) throw getCallback1.getException();
-        if (!getCallback2.isSuccess()) throw getCallback2.getException();
-
-        assertPetMatches(pet1, getCallback1.getResult());
-        assertPetMatches(pet2, getCallback2.getResult());
-
-        assertValidProgress(getCallback1.getDownloadProgress());
-        assertValidProgress(getCallback2.getDownloadProgress());
-
-        // Last callback should fail with ApiException
-        assertFalse(getCallback3.isSuccess());
-        final ApiException exception = getCallback3.getException();
-        assertNotNull(exception);
-        assertEquals(404, exception.getCode());
-        api.deletePet(pet1.getId(), null);
-        api.deletePet(pet2.getId(), null);
-    }
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertPetMatches(pet, fetched);
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        assertEquals(basePath, api.getApiClient().getBasePath());
-        Pet pet = createPet();
-        api.addPet(pet);
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.PENDING);
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList("pending"));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    @Disabled
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<org.openapitools.client.model.Tag> tags = new ArrayList<org.openapitools.client.model.Tag>();
-        org.openapitools.client.model.Tag tag1 = new org.openapitools.client.model.Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags((Arrays.asList("friendly")));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    @Disabled
-    public void testDeletePet() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(pet.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (ApiException e) {
-            LOG.info("Code: {}. Message: {}", e.getCode(), e.getMessage());
-            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        // respect user supplied content type
-        ApiResponse formDataResponse = api.uploadFileWithHttpInfo(pet.getId(), "multipart/form-data", "a test file", new File(file.getAbsolutePath()));
-        assertEquals(200, formDataResponse.getStatusCode());
-
-        // use default content type
-        ApiResponse defaultResponse = api.uploadFileWithHttpInfo(pet.getId(), null, "a test file", new File(file.getAbsolutePath()));
-        assertEquals(200, defaultResponse.getStatusCode());
-
-        try {
-            // use invalid content type
-            api.uploadFileWithHttpInfo(pet.getId(), "image/jpeg", "a test file", new File(file.getAbsolutePath()));
-        } catch (ApiException e) {
-            LOG.info("Code: {}. Message: {}", e.getCode(), e.getMessage());
-            assertEquals(415, e.getCode());
-        }
-        
-        api.deletePet(pet.getId(), null);
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(
-                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(
-                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createPet() {
-        Pet pet = new Pet();
-        pet.setId(ThreadLocalRandom.current().nextLong(Long.MAX_VALUE));
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos =
-                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-    private String serializeJson(Object o, ApiClient apiClient) {
-        return apiClient.getJSON().serialize(o);
-    }
-
-    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
-        return (T) apiClient.getJSON().deserialize(json, type);
-    }
-
-    private void assertPetMatches(Pet expected, Pet actual) {
-        assertNotNull(actual);
-        assertEquals(expected.getId(), actual.getId());
-        assertNotNull(actual.getCategory());
-        assertEquals(expected.getCategory().getName(), actual.getCategory().getName());
-    }
-
-    /**
-     * Assert that the given upload/download progress list satisfies the following constraints:
-     *
-     * <p>- List is not empty - Byte count should be nondecreasing - The last element, and only the
-     * last element, should have done=true
-     */
-    private void assertValidProgress(List<Progress> progressList) {
-        assertFalse(progressList.isEmpty());
-
-        Progress prev = null;
-        int index = 0;
-        for (Progress progress : progressList) {
-            if (prev != null) {
-                if (prev.done || prev.bytes > progress.bytes) {
-                    fail("Progress list out of order at index " + index + ": " + progressList);
-                }
-            }
-            prev = progress;
-            index += 1;
-        }
-
-        if (!prev.done) {
-            fail("Last progress item should have done=true: " + progressList);
-        }
-    }
-
-    private static class TestApiCallback<T> implements ApiCallback<T> {
-
-        private final CountDownLatch latch;
-        private final ConcurrentLinkedQueue<Progress> uploadProgress =
-                new ConcurrentLinkedQueue<Progress>();
-        private final ConcurrentLinkedQueue<Progress> downloadProgress =
-                new ConcurrentLinkedQueue<Progress>();
-
-        private boolean done;
-        private boolean success;
-        private ApiException exception;
-        private T result;
-
-        public TestApiCallback(CountDownLatch latch) {
-            this.latch = latch;
-            this.done = false;
-        }
-
-        @Override
-        public void onFailure(
-                ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
-            exception = e;
-            this.done = true;
-            this.success = false;
-            latch.countDown();
-        }
-
-        @Override
-        public void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders) {
-            this.result = result;
-            this.done = true;
-            this.success = true;
-            latch.countDown();
-        }
-
-        @Override
-        public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
-            uploadProgress.add(new Progress(bytesWritten, contentLength, done));
-        }
-
-        @Override
-        public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
-            downloadProgress.add(new Progress(bytesRead, contentLength, done));
-        }
-
-        public boolean isDone() {
-            return done;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-
-        public ApiException getException() {
-            return exception;
-        }
-
-        public T getResult() {
-            return result;
-        }
-
-        public List<Progress> getUploadProgress() {
-            return new ArrayList<Progress>(uploadProgress);
-        }
-
-        public List<Progress> getDownloadProgress() {
-            return new ArrayList<Progress>(downloadProgress);
-        }
-    }
-
-    private static class Progress {
-        public final long bytes;
-        public final long contentLength;
-        public final boolean done;
-
-        public Progress(long bytes, long contentLength, boolean done) {
-            this.bytes = bytes;
-            this.contentLength = contentLength;
-            this.done = done;
-        }
-
-        @Override
-        public String toString() {
-            return "<Progress " + bytes + " " + contentLength + " " + done + ">";
-        }
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
deleted file mode 100644
index c4b8362967d0..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.openapitools.client.auth;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.*;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Pair;
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        assertEquals(1, queryParams.size());
-        for (Pair queryParam : queryParams) {
-            assertEquals("my-api-key", queryParam.getValue());
-        }
-
-        // no changes to header or cookie parameters
-        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInQueryWithNullValue() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-        assertEquals(0, cookieParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to query or cookie parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithNullValue() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInCookieWithPrefix() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to query or header parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-        assertEquals(1, cookieParams.size());
-        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
-    }
-
-    @Test
-    public void testApplyToParamsInCookieWithNullValue() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-        assertEquals(0, headerParams.size());
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
deleted file mode 100644
index 1230a9d9d2e9..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.openapitools.client.auth;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.*;
-import org.openapitools.client.ApiException;
-import org.openapitools.client.Pair;
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @BeforeEach
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() throws ApiException {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-        Map<String, String> cookieParams = new HashMap<String, String>();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-
-        // no changes to query or cookie parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, cookieParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic "
-        // prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username and password should be ignored
-        queryParams = new ArrayList<Pair>();
-        headerParams = new HashMap<String, String>();
-        auth.setUsername(null);
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
deleted file mode 100644
index 13d9276a7874..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.openapitools.client.auth;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.util.Collections;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import okhttp3.*;
-import okhttp3.Interceptor.Chain;
-import okhttp3.Response.Builder;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.oltu.oauth2.client.OAuthClient;
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
-import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
-import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
-import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
-import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-public class RetryingOAuthTest {
-
-    private RetryingOAuth oauth;
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        oauth =
-                new RetryingOAuth(
-                        "_clientId",
-                        "_clientSecret",
-                        OAuthFlow.ACCESS_CODE,
-                        "https://token.example.com",
-                        Collections.<String, String>emptyMap());
-        oauth.setAccessToken("expired-access-token");
-        FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true);
-    }
-
-    @Test
-    public void testSingleRequestUnauthorized() throws Exception {
-        Response response = oauth.intercept(mockChain());
-        assertEquals(HttpURLConnection.HTTP_OK, response.code());
-    }
-
-    @Test
-    public void testTwoConcurrentRequestsUnauthorized() throws Exception {
-
-        Callable<Response> callable =
-                new Callable<Response>() {
-                    @Override
-                    public Response call() throws Exception {
-                        return oauth.intercept(mockChain());
-                    }
-                };
-        ExecutorService executor = Executors.newFixedThreadPool(2);
-        try {
-            Future<Response> response1 = executor.submit(callable);
-            Future<Response> response2 = executor.submit(callable);
-
-            assertEquals(HttpURLConnection.HTTP_OK, response1.get().code());
-            assertEquals(HttpURLConnection.HTTP_OK, response2.get().code());
-        } finally {
-            executor.shutdown();
-        }
-    }
-
-    private OAuthClient mockOAuthClient() throws OAuthProblemException, OAuthSystemException {
-        OAuthJSONAccessTokenResponse response = mock(OAuthJSONAccessTokenResponse.class);
-        when(response.getAccessToken())
-                .thenAnswer(
-                        new Answer<String>() {
-                            @Override
-                            public String answer(InvocationOnMock invocation) throws Throwable {
-                                // sleep ensures that the bug is triggered.
-                                Thread.sleep(1000);
-                                return "new-access-token";
-                            }
-                        });
-
-        OAuthClient client = mock(OAuthClient.class);
-        when(client.accessToken(any(OAuthClientRequest.class))).thenReturn(response);
-        return client;
-    }
-
-    private Chain mockChain() throws IOException {
-        Chain chain = mock(Chain.class);
-
-        final Request request = new Request.Builder().url("https://api.example.com").build();
-        when(chain.request()).thenReturn(request);
-
-        when(chain.proceed(any(Request.class)))
-                .thenAnswer(
-                        new Answer<Response>() {
-                            @Override
-                            public Response answer(InvocationOnMock inv) {
-                                Request r = inv.getArgument(0);
-                                int responseCode =
-                                        "Bearer new-access-token".equals(r.header("Authorization"))
-                                                ? HttpURLConnection.HTTP_OK
-                                                : HttpURLConnection.HTTP_UNAUTHORIZED;
-                                return new Builder()
-                                        .protocol(Protocol.HTTP_1_0)
-                                        .message("sup")
-                                        .request(request)
-                                        .body(
-                                                ResponseBody.create(
-                                                        new byte[0],
-                                                        MediaType.get("application/test")))
-                                        .code(responseCode)
-                                        .build();
-                            }
-                        });
-
-        return chain;
-    }
-}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
index 089fe1a41581..cf8a581e8f44 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
@@ -19,6 +19,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124,4 +125,12 @@ public void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    public void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
index adcfde4a33d0..6fbe9280c058 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -19,6 +19,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
@@ -86,4 +87,12 @@ public void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    public void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java
deleted file mode 100644
index 7939998e1a2f..000000000000
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for Pet
- */
-public class PetTest {
-    private final Pet model = new Pet();
-
-    /**
-     * Model tests for Pet
-     */
-    @Test
-    public void testPet() {
-        // TODO: test Pet
-    }
-
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'category'
-     */
-    @Test
-    public void categoryTest() {
-        // TODO: test category
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'photoUrls'
-     */
-    @Test
-    public void photoUrlsTest() {
-        // TODO: test photoUrls
-    }
-
-    /**
-     * Test the property 'tags'
-     */
-    @Test
-    public void tagsTest() {
-        // TODO: test tags
-    }
-
-    /**
-     * Test the property 'status'
-     */
-    @Test
-    public void statusTest() {
-        // TODO: test status
-    }
-
-}

From 26242d9d5c19c322ec72ec1671bcd42d2fbf7ca8 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 09:12:27 +0100
Subject: [PATCH 10/22] fix java-helidon

---
 .../java-helidon/client/libraries/mp/enumClass.mustache         | 2 +-
 .../java-helidon/client/libraries/se/enumClass.mustache         | 2 +-
 .../java-helidon/server/libraries/mp/enumClass.mustache         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
index d32efebf489d..84ba1d3eb5ce 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
@@ -5,7 +5,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
     {{dataType}} value;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
index d32efebf489d..84ba1d3eb5ce 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
@@ -5,7 +5,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
     {{dataType}} value;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
index 1b67dadb3601..4df7005091ae 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
@@ -1,7 +1,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
 

From 3b84ee876bd2f5ff2567c0d2959e1ca13c645621 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 09:28:57 +0100
Subject: [PATCH 11/22] update all samples again

---
 .../openapitools/client/model/EnumTest.java   |   4 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../openapitools/client/model/EnumTest.java   |   4 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../openapitools/client/model/EnumTest.java   |   4 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../openapitools/client/model/EnumTest.java   |   4 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../openapitools/client/ApiClientTest.java    | 350 +++++++++++
 .../org/openapitools/client/ClientTest.java   |  70 +++
 .../client/ConfigurationTest.java             |  15 +
 .../openapitools/client/StringUtilTest.java   |  33 +
 .../client/api/AnotherFakeApiTest.java        |  62 +-
 .../client/api/DefaultApiTest.java            |  35 --
 .../openapitools/client/api/FakeApiTest.java  |  47 +-
 .../api/FakeClassnameTags123ApiTest.java      |  27 +-
 .../openapitools/client/api/PetApiTest.java   | 594 ++++++++++++++++++
 .../openapitools/client/api/StoreApiTest.java |  39 +-
 .../openapitools/client/api/UserApiTest.java  |  62 +-
 .../client/auth/ApiKeyAuthTest.java           | 119 ++++
 .../client/auth/HttpBasicAuthTest.java        |  65 ++
 .../client/auth/RetryingOAuthTest.java        | 124 ++++
 .../model/AdditionalPropertiesClassTest.java  |   2 +-
 ...OfModelArrayAnyOfAllOfAttributesCTest.java |   9 -
 .../model/AllOfModelArrayAnyOfTest.java       |   9 -
 .../openapitools/client/model/AnimalTest.java |   4 +-
 .../client/model/AppleReqTest.java            |   2 +-
 .../openapitools/client/model/AppleTest.java  |   2 +-
 ...neAllOfArrayAllofDogPropertyInnerTest.java |   2 +-
 .../client/model/ArrayOfInlineAllOfTest.java  |   2 +-
 .../client/model/ArrayOfNumberOnlyTest.java   |   2 +-
 .../client/model/ArrayTestTest.java           |   2 +-
 .../client/model/BananaReqTest.java           |   2 +-
 .../openapitools/client/model/BananaTest.java |   2 +-
 .../client/model/BasquePigTest.java           |   2 +-
 .../client/model/CapitalizationTest.java      |   2 +-
 .../openapitools/client/model/CatTest.java    |   3 +-
 .../client/model/CategoryTest.java            |   2 +-
 .../client/model/ClassModelTest.java          |   2 +-
 .../openapitools/client/model/ClientTest.java |   2 +-
 .../model/ComplexQuadrilateralTest.java       |   2 +-
 .../client/model/DanishPigTest.java           |   2 +-
 .../client/model/DeprecatedObjectTest.java    |   2 +-
 .../openapitools/client/model/DogTest.java    |   2 +-
 .../client/model/DrawingTest.java             |   2 +-
 .../client/model/EnumArraysTest.java          |   2 +-
 .../client/model/EnumClassTest.java           |   1 +
 .../model/EnumStringDiscriminatorTest.java    |   2 +-
 .../client/model/EnumTestTest.java            |   2 +-
 .../client/model/EquilateralTriangleTest.java |   2 +-
 .../client/model/FileSchemaTestClassTest.java |   2 +-
 .../model/FooGetDefaultResponseTest.java      |   2 +-
 .../openapitools/client/model/FooTest.java    |   2 +-
 .../client/model/FormatTestTest.java          |   2 +-
 .../client/model/FruitReqTest.java            |   2 +-
 .../openapitools/client/model/FruitTest.java  |   2 +-
 .../client/model/GmFruitTest.java             |   2 +-
 .../client/model/GrandparentAnimalTest.java   |   3 +-
 .../client/model/HasOnlyReadOnlyTest.java     |   2 +-
 .../client/model/HealthCheckResultTest.java   |   2 +-
 .../client/model/IsoscelesTriangleTest.java   |   2 +-
 .../openapitools/client/model/MammalTest.java |   2 +-
 .../client/model/MapTestTest.java             |   2 +-
 ...rtiesAndAdditionalPropertiesClassTest.java |   2 +-
 .../client/model/Model200ResponseTest.java    |   2 +-
 .../client/model/ModelApiResponseTest.java    |   2 +-
 .../client/model/ModelFileTest.java           |   2 +-
 .../client/model/ModelListTest.java           |   2 +-
 .../client/model/ModelReturnTest.java         |   2 +-
 .../openapitools/client/model/NameTest.java   |   2 +-
 .../openapitools/client/model/NewPetTest.java |  32 -
 .../client/model/NullableClassTest.java       |   2 +-
 .../client/model/NullableShapeTest.java       |   2 +-
 .../client/model/NumberOnlyTest.java          |   2 +-
 .../model/ObjectWithDeprecatedFieldsTest.java |   2 +-
 .../openapitools/client/model/OrderTest.java  |  11 +-
 .../client/model/OuterCompositeTest.java      |   2 +-
 .../model/OuterEnumDefaultValueTest.java      |   1 +
 .../OuterEnumIntegerDefaultValueTest.java     |   1 +
 .../client/model/OuterEnumIntegerTest.java    |   1 +
 .../client/model/OuterEnumTest.java           |   1 +
 .../client/model/ParentPetTest.java           |   2 +-
 .../openapitools/client/model/PetRefTest.java |  44 --
 .../openapitools/client/model/PetTest.java    |  92 +++
 .../client/model/PetWithRequiredTagsTest.java |   2 +-
 .../openapitools/client/model/PigTest.java    |   2 +-
 .../model/QuadrilateralInterfaceTest.java     |   2 +-
 .../client/model/QuadrilateralTest.java       |   2 +-
 .../client/model/ReadOnlyFirstTest.java       |   2 +-
 .../client/model/ScaleneTriangleTest.java     |   2 +-
 .../client/model/ShapeInterfaceTest.java      |   2 +-
 .../client/model/ShapeOrNullTest.java         |   2 +-
 .../openapitools/client/model/ShapeTest.java  |   2 +-
 .../client/model/SimpleQuadrilateralTest.java |   2 +-
 .../client/model/SpecialModelNameTest.java    |   2 +-
 .../openapitools/client/model/TagTest.java    |   2 +-
 .../client/model/TriangleInterfaceTest.java   |   2 +-
 .../client/model/TriangleTest.java            |   2 +-
 .../openapitools/client/model/UserTest.java   |   2 +-
 .../openapitools/client/model/ValueTest.java  |   1 -
 .../openapitools/client/model/WhaleTest.java  |   2 +-
 .../openapitools/client/model/ZebraTest.java  |   2 +-
 .../openapitools/server/model/EnumTest.java   |   4 +-
 .../org/openapitools/server/model/Order.java  |   2 +-
 .../openapitools/server/model/EnumTest.java   |   4 +-
 .../org/openapitools/server/model/Order.java  |   2 +-
 106 files changed, 1622 insertions(+), 399 deletions(-)
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
 create mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java

diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java
index 538f09adcede..6ab0e4287e17 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -78,7 +78,7 @@ public String toString() {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
     Integer value;
 
@@ -101,7 +101,7 @@ public String toString() {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
     Double value;
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
index 5aa83727e198..88da61ce8993 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -63,7 +63,7 @@ public String toString() {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
     BigDecimal value;
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java
index 538f09adcede..6ab0e4287e17 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -78,7 +78,7 @@ public String toString() {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
     Integer value;
 
@@ -101,7 +101,7 @@ public String toString() {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
     Double value;
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
index 5aa83727e198..88da61ce8993 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
@@ -63,7 +63,7 @@ public String toString() {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
     BigDecimal value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java
index 538f09adcede..6ab0e4287e17 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -78,7 +78,7 @@ public String toString() {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
     Integer value;
 
@@ -101,7 +101,7 @@ public String toString() {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
     Double value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
index 5aa83727e198..88da61ce8993 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -63,7 +63,7 @@ public String toString() {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
     BigDecimal value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java
index 538f09adcede..6ab0e4287e17 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -78,7 +78,7 @@ public String toString() {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
     Integer value;
 
@@ -101,7 +101,7 @@ public String toString() {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
     Double value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
index 5aa83727e198..88da61ce8993 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
@@ -63,7 +63,7 @@ public String toString() {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
     BigDecimal value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
new file mode 100644
index 000000000000..05c47e82206e
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -0,0 +1,350 @@
+package org.openapitools.client;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.*;
+
+import okhttp3.OkHttpClient;
+import org.junit.jupiter.api.*;
+import org.openapitools.client.auth.*;
+
+public class ApiClientTest {
+    ApiClient apiClient;
+    JSON json;
+
+    @BeforeEach
+    public void setup() {
+        apiClient = new ApiClient();
+        json = apiClient.getJSON();
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime(null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/json-patch+json"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals(
+                "application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertNull(apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    /*
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+    */
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testGetAndSetConnectTimeout() {
+        // connect timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getConnectTimeout());
+        assertEquals(10000, apiClient.getHttpClient().connectTimeoutMillis());
+
+        apiClient.setConnectTimeout(0);
+        assertEquals(0, apiClient.getConnectTimeout());
+        assertEquals(0, apiClient.getHttpClient().connectTimeoutMillis());
+
+        apiClient.setConnectTimeout(10000);
+    }
+
+    @Test
+    public void testGetAndSetReadTimeout() {
+        // read timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getReadTimeout());
+        assertEquals(10000, apiClient.getHttpClient().readTimeoutMillis());
+
+        apiClient.setReadTimeout(0);
+        assertEquals(0, apiClient.getReadTimeout());
+        assertEquals(0, apiClient.getHttpClient().readTimeoutMillis());
+
+        apiClient.setReadTimeout(10000);
+    }
+
+    @Test
+    public void testGetAndSetWriteTimeout() {
+        // write timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getWriteTimeout());
+        assertEquals(10000, apiClient.getHttpClient().writeTimeoutMillis());
+
+        apiClient.setWriteTimeout(0);
+        assertEquals(0, apiClient.getWriteTimeout());
+        assertEquals(0, apiClient.getHttpClient().writeTimeoutMillis());
+
+        apiClient.setWriteTimeout(10000);
+    }
+
+    @Test
+    public void testParameterToPairWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
+        assertEquals(1, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPair(name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsCollection() throws Exception {
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
+        assertEquals(0, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Integer> objects = new ArrayList<Integer>();
+        objects.add(new Integer(1));
+
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+        for (int i = 0; i < values.size(); i++) {
+            assertEquals(
+                    apiClient.escapeString(apiClient.parameterToString(values.get(i))),
+                    multiPairs.get(i).getValue());
+        }
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            if (!delimiter.equals(",")) {
+                // commas are not escaped because they are reserved characters in URIs
+                delimiter = apiClient.escapeString(delimiter);
+            }
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+            for (int i = 0; i < values.size(); i++) {
+                assertEquals(
+                        apiClient.escapeString(apiClient.parameterToString(values.get(i))),
+                        pairValueSplit[i]);
+            }
+        }
+    }
+
+    @Test
+    public void testSanitizeFilename() {
+        assertEquals("sun", apiClient.sanitizeFilename("sun"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
+    }
+
+    @Test
+    public void testNewHttpClient() {
+        OkHttpClient oldClient = apiClient.getHttpClient();
+        apiClient.setHttpClient(oldClient.newBuilder().build());
+        assertNotSame(apiClient.getHttpClient(), oldClient);
+    }
+
+    /**
+     * Tests the invariant that the HttpClient for the ApiClient must never be null
+     */
+    @Test
+    public void testNullHttpClient() {
+        NullPointerException thrown = Assertions.assertThrows(NullPointerException.class, () -> {
+            apiClient.setHttpClient(null);
+        });
+        Assertions.assertEquals("HttpClient must not be null!", thrown.getMessage());
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
new file mode 100644
index 000000000000..b8ca4aff421e
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java
@@ -0,0 +1,70 @@
+package org.openapitools.client;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.*;
+
+import okhttp3.OkHttpClient;
+import org.junit.jupiter.api.*;
+import org.openapitools.client.auth.*;
+
+import java.math.BigDecimal;
+
+import org.openapitools.client.model.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ClientTest {
+    ApiClient apiClient;
+    JSON json;
+
+    @BeforeEach
+    public void setup() {
+        apiClient = new ApiClient();
+        json = apiClient.getJSON();
+    }
+
+    /**
+     * Test the property 'arrayArrayNumber'
+     */
+    @Test
+    public void arrayArrayNumberTest() {
+        ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
+        BigDecimal b1 = new BigDecimal("12.3");
+        BigDecimal b2 = new BigDecimal("5.6");
+        List<BigDecimal> arrayArrayNumber = new ArrayList<BigDecimal>();
+        arrayArrayNumber.add(b1);
+        arrayArrayNumber.add(b2);
+        model.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
+        model.getArrayArrayNumber().add(arrayArrayNumber);
+
+        // create another instance for comparison
+        BigDecimal b3 = new BigDecimal("12.3");
+        BigDecimal b4 = new BigDecimal("5.6");
+        ArrayOfArrayOfNumberOnly model2 = new ArrayOfArrayOfNumberOnly();
+        List<BigDecimal> arrayArrayNumber2 = new ArrayList<BigDecimal>();
+        arrayArrayNumber2.add(b1);
+        arrayArrayNumber2.add(b2);
+        model2.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
+        model2.getArrayArrayNumber().add(arrayArrayNumber2);
+
+        Assertions.assertTrue(model2.equals(model));
+    }
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        Pet model = new Pet();
+        // test Pet
+        model.setId(1029L);
+        model.setName("Dog");
+
+        Pet model2 = new Pet();
+        model2.setId(1029L);
+        model2.setName("Dog");
+
+        Assertions.assertTrue(model.equals(model2));
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
new file mode 100644
index 000000000000..e5b9d146a4eb
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java
@@ -0,0 +1,15 @@
+package org.openapitools.client;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.*;
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
new file mode 100644
index 000000000000..c946674e470a
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java
@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.*;
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
index 9f059948f816..0f49c5e2e01c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -2,31 +2,23 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * The version of the OpenAPI document: 1.0.0
- * 
+ * OpenAPI spec version: 1.0.0
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
-
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Client;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for AnotherFakeApi
- */
+/** API tests for AnotherFakeApi */
 @Disabled
 public class AnotherFakeApiTest {
 
@@ -35,51 +27,15 @@ public class AnotherFakeApiTest {
     /**
      * To test special tags
      *
-     * To test special tags and operation ID starting with number
+     * <p>To test special tags and operation ID starting with number
      *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void call123testSpecialTagsTest() throws ApiException {
-        Client client = null;
-        Client response = api.call123testSpecialTags(client);
-        // TODO: test validations
-    }
+        Client body = null;
+        Client response = api.call123testSpecialTags(body);
 
-    /**
-     * parameter array number default value
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void getParameterArrayNumberTest() throws ApiException {
-        List<Integer> array = null;
-        api.getParameterArrayNumber(array);
         // TODO: test validations
     }
-
-    /**
-     * parameter string number
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void getParameterStringNumberTest() throws ApiException {
-        BigDecimal stringNumber = null;
-        api.getParameterStringNumber(stringNumber);
-        // TODO: test validations
-    }
-
-    /**
-     * null request body
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void nullRequestBodyTest() throws ApiException {
-        String acceptLanguage = null;
-        api.nullRequestBody(acceptLanguage);
-        // TODO: test validations
-    }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/DefaultApiTest.java
index 9dbc195b0857..2672798d71da 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/DefaultApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/DefaultApiTest.java
@@ -14,8 +14,6 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.ApiException;
-import org.openapitools.client.model.FakeAnyOfWIthSameErasureGet200Response;
-import org.openapitools.client.model.FakeOneOfWIthSameErasureGet200Response;
 import org.openapitools.client.model.FooGetDefaultResponse;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -33,39 +31,6 @@ public class DefaultApiTest {
 
     private final DefaultApi api = new DefaultApi();
 
-    /**
-     * Test route, this shouldn&#39;t cause a compiler error
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeAnyOfWIthSameErasureGetTest() throws ApiException {
-        FakeAnyOfWIthSameErasureGet200Response response = api.fakeAnyOfWIthSameErasureGet();
-        // TODO: test validations
-    }
-
-    /**
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeFreeFormQueryParametersGetTest() throws ApiException {
-        String fixed = null;
-        Object freeForm = null;
-        api.fakeFreeFormQueryParametersGet(fixed, freeForm);
-        // TODO: test validations
-    }
-
-    /**
-     * Test route, this shouldn&#39;t cause a compiler error
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeOneOfWIthSameErasureGetTest() throws ApiException {
-        FakeOneOfWIthSameErasureGet200Response response = api.fakeOneOfWIthSameErasureGet();
-        // TODO: test validations
-    }
-
     /**
      * @throws ApiException if the Api call fails
      */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index ab5cc50564f8..609fc9f0a40f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -16,13 +16,10 @@
 import org.openapitools.client.ApiException;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
-import org.openapitools.client.model.FakeRefParameterPetIdParameter;
 import java.io.File;
 import org.openapitools.client.model.FileSchemaTestClass;
-import org.openapitools.client.model.FreeFormObjectTestClass;
 import org.openapitools.client.model.HealthCheckResult;
 import java.time.LocalDate;
-import org.openapitools.client.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.OuterEnum;
@@ -44,17 +41,6 @@ public class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
 
-    /**
-     * Get a free form object or Json string
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeGetFreeFormObjectGetTest() throws ApiException {
-        FreeFormObjectTestClass response = api.fakeGetFreeFormObjectGet();
-        // TODO: test validations
-    }
-
     /**
      * Test serialization of outer boolean types
      *
@@ -103,36 +89,6 @@ public void fakeOuterStringSerializeTest() throws ApiException {
         // TODO: test validations
     }
 
-    /**
-     * fake reference parameter
-     *
-     * 
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeRefParameterTest() throws ApiException {
-        FakeRefParameterPetIdParameter petId = null;
-        api.fakeRefParameter(petId);
-        // TODO: test validations
-    }
-
-    /**
-     * fake reference parameter
-     *
-     * 
-     *
-     * @throws ApiException if the Api call fails
-     */
-    @Test
-    public void fakeUploadRefRequestBodiesTest() throws ApiException {
-        Long petId = null;
-        String additionalMetadata = null;
-        File _file = null;
-        ModelApiResponse response = api.fakeUploadRefRequestBodies(petId, additionalMetadata, _file);
-        // TODO: test validations
-    }
-
     /**
      * Array of Enums
      *
@@ -265,7 +221,8 @@ public void testEnumParametersTest() throws ApiException {
         List<String> enumFormStringArray = null;
         String enumFormString = null;
         Integer enumFormInteger = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
+        Double enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         // TODO: test validations
     }
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
index aa1b824dd5a2..3eb19491b9b0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -2,30 +2,23 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * The version of the OpenAPI document: 1.0.0
- * 
+ * OpenAPI spec version: 1.0.0
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
-
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
-import org.openapitools.client.model.Client;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Client;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * API tests for FakeClassnameTags123Api
- */
+/** API tests for FakeClassnameTags123Api */
 @Disabled
 public class FakeClassnameTags123ApiTest {
 
@@ -34,15 +27,15 @@ public class FakeClassnameTags123ApiTest {
     /**
      * To test class name in snake case
      *
-     * To test class name in snake case
+     * <p>To test class name in snake case
      *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void testClassnameTest() throws ApiException {
-        Client client = null;
-        Client response = api.testClassname(client);
+        Client body = null;
+        Client response = api.testClassname(body);
+
         // TODO: test validations
     }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
new file mode 100644
index 000000000000..9a9a777af869
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -0,0 +1,594 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.*;
+import org.openapitools.client.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.model.*;
+import org.openapitools.client.model.Pet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * API tests for PetApi
+ */
+public class PetApiTest {
+
+    private PetApi api = new PetApi();
+    private final Logger LOG = LoggerFactory.getLogger(PetApiTest.class);
+    // In the circle.yml file, /etc/host is configured with an entry to resolve petstore.swagger.io
+    // to 127.0.0.1
+    private static String basePath = "http://petstore.swagger.io:80/v2";
+
+    @BeforeEach
+    public void setup() {
+        // setup authentication
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) api.getApiClient().getAuthentication("api_key");
+        apiKeyAuth.setApiKey("special-key");
+        api.getApiClient().setBasePath(basePath);
+    }
+
+    @Test
+    public void testApiClient() {
+        // the default api client is used
+        assertEquals(Configuration.getDefaultApiClient(), api.getApiClient());
+        assertNotNull(api.getApiClient());
+        assertEquals(basePath, api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+
+        ApiClient oldClient = api.getApiClient();
+
+        ApiClient newClient = new ApiClient();
+        newClient.setVerifyingSsl(true);
+        newClient.setBasePath("http://example.com");
+        newClient.setDebugging(true);
+
+        // set api client via constructor
+        api = new PetApi(newClient);
+        assertNotNull(api.getApiClient());
+        assertEquals("http://example.com", api.getApiClient().getBasePath());
+        assertTrue(api.getApiClient().isDebugging());
+
+        // set api client via setter method
+        api.setApiClient(oldClient);
+        assertNotNull(api.getApiClient());
+        assertEquals(basePath, api.getApiClient().getBasePath());
+        assertFalse(api.getApiClient().isDebugging());
+    }
+
+    @Test
+    public void testCreateAndGetPet() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertPetMatches(pet, fetched);
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testCreateAndGetPetWithHttpInfo() throws Exception {
+        Pet pet = createPet();
+        api.addPetWithHttpInfo(pet);
+
+        ApiResponse<Pet> resp = api.getPetByIdWithHttpInfo(pet.getId());
+        assertEquals(200, resp.getStatusCode());
+        assertEquals("application/json", resp.getHeaders().get("Content-Type").get(0));
+        Pet fetched = resp.getData();
+
+        assertPetMatches(pet, fetched);
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testCreateAndGetPetAsync() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+        // to store returned Pet or error message/exception
+        final Map<String, Object> result = new HashMap<String, Object>();
+
+        api.getPetByIdAsync(
+                pet.getId(),
+                new ApiCallback<Pet>() {
+                    @Override
+                    public void onFailure(
+                            ApiException e,
+                            int statusCode,
+                            Map<String, List<String>> responseHeaders) {
+                        result.put("error", e.getMessage());
+                    }
+
+                    @Override
+                    public void onSuccess(
+                            Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
+                        result.put("pet", pet);
+                    }
+
+                    @Override
+                    public void onUploadProgress(
+                            long bytesWritten, long contentLength, boolean done) {
+                        // empty
+                    }
+
+                    @Override
+                    public void onDownloadProgress(
+                            long bytesRead, long contentLength, boolean done) {
+                        // empty
+                    }
+                });
+
+        // wait for the asynchronous call to finish (at most 10 seconds)
+        final int maxTry = 10;
+        int tryCount = 1;
+        Pet fetched = null;
+        do {
+            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
+            Thread.sleep(1000);
+            tryCount += 1;
+            if (result.get("error") != null) fail((String) result.get("error"));
+            if (result.get("pet") != null) {
+                fetched = (Pet) result.get("pet");
+                break;
+            }
+        } while (result.isEmpty());
+        assertPetMatches(pet, fetched);
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testCreateAndGetPetAsyncInvalidID() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+        // to store returned Pet or error message/exception
+        final Map<String, Object> result = new HashMap<String, Object>();
+
+        // test getting a nonexistent pet
+        result.clear();
+        api.getPetByIdAsync(
+                -10000L,
+                new ApiCallback<Pet>() {
+                    @Override
+                    public void onFailure(
+                            ApiException e,
+                            int statusCode,
+                            Map<String, List<String>> responseHeaders) {
+                        result.put("exception", e);
+                    }
+
+                    @Override
+                    public void onSuccess(
+                            Pet pet, int statusCode, Map<String, List<String>> responseHeaders) {
+                        result.put("pet", pet);
+                    }
+
+                    @Override
+                    public void onUploadProgress(
+                            long bytesWritten, long contentLength, boolean done) {
+                        // empty
+                    }
+
+                    @Override
+                    public void onDownloadProgress(
+                            long bytesRead, long contentLength, boolean done) {
+                        // empty
+                    }
+                });
+
+        // wait for the asynchronous call to finish (at most 10 seconds)
+        final int maxTry = 10;
+        int tryCount = 1;
+        Pet fetched = null;
+        ApiException exception = null;
+
+        do {
+            if (tryCount > maxTry) fail("have not got result of getPetByIdAsync after 10 seconds");
+            Thread.sleep(1000);
+            tryCount += 1;
+            if (result.get("pet") != null) fail("expected an error");
+            if (result.get("exception") != null) {
+                exception = (ApiException) result.get("exception");
+                break;
+            }
+        } while (result.isEmpty());
+        assertNotNull(exception);
+        assertEquals(404, exception.getCode());
+        String pattern = "^Message: Not Found\\RHTTP response code: 404\\RHTTP response body: .*\\RHTTP response headers: .*$";
+        assertTrue(exception.getMessage().matches(pattern));
+        assertEquals("application/json", exception.getResponseHeaders().get("Content-Type").get(0));
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testCreateAndGetMultiplePetsAsync() throws Exception {
+        Pet pet1 = createPet();
+        Pet pet2 = createPet();
+
+        final CountDownLatch addLatch = new CountDownLatch(2);
+        final TestApiCallback<Void> addCallback1 = new TestApiCallback<Void>(addLatch);
+        final TestApiCallback<Void> addCallback2 = new TestApiCallback<Void>(addLatch);
+
+        // Make 2 simultaneous calls
+        api.addPetAsync(pet1, addCallback1);
+        api.addPetAsync(pet2, addCallback2);
+
+        // wait for both asynchronous calls to finish (at most 10 seconds)
+        assertTrue(addLatch.await(10, TimeUnit.SECONDS));
+
+        assertTrue(addCallback1.isDone());
+        assertTrue(addCallback2.isDone());
+
+        if (!addCallback1.isSuccess()) throw addCallback1.getException();
+        if (!addCallback2.isSuccess()) throw addCallback2.getException();
+
+        assertValidProgress(addCallback1.getUploadProgress());
+        assertValidProgress(addCallback2.getUploadProgress());
+
+        final CountDownLatch getLatch = new CountDownLatch(3);
+        final TestApiCallback<Pet> getCallback1 = new TestApiCallback<Pet>(getLatch);
+        final TestApiCallback<Pet> getCallback2 = new TestApiCallback<Pet>(getLatch);
+        final TestApiCallback<Pet> getCallback3 = new TestApiCallback<Pet>(getLatch);
+
+        api.getPetByIdAsync(pet1.getId(), getCallback1);
+        api.getPetByIdAsync(pet2.getId(), getCallback2);
+        // Get nonexistent pet
+        api.getPetByIdAsync(-10000L, getCallback3);
+
+        // wait for all asynchronous calls to finish (at most 10 seconds)
+        assertTrue(getLatch.await(10, TimeUnit.SECONDS));
+
+        assertTrue(getCallback1.isDone());
+        assertTrue(getCallback2.isDone());
+        assertTrue(getCallback3.isDone());
+
+        if (!getCallback1.isSuccess()) throw getCallback1.getException();
+        if (!getCallback2.isSuccess()) throw getCallback2.getException();
+
+        assertPetMatches(pet1, getCallback1.getResult());
+        assertPetMatches(pet2, getCallback2.getResult());
+
+        assertValidProgress(getCallback1.getDownloadProgress());
+        assertValidProgress(getCallback2.getDownloadProgress());
+
+        // Last callback should fail with ApiException
+        assertFalse(getCallback3.isSuccess());
+        final ApiException exception = getCallback3.getException();
+        assertNotNull(exception);
+        assertEquals(404, exception.getCode());
+        api.deletePet(pet1.getId(), null);
+        api.deletePet(pet2.getId(), null);
+    }
+
+    @Test
+    public void testUpdatePet() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+        pet.setName("programmer");
+
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertPetMatches(pet, fetched);
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testFindPetsByStatus() throws Exception {
+        assertEquals(basePath, api.getApiClient().getBasePath());
+        Pet pet = createPet();
+        api.addPet(pet);
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.PENDING);
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList("pending"));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    @Disabled
+    public void testFindPetsByTags() throws Exception {
+        Pet pet = createPet();
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+
+        List<org.openapitools.client.model.Tag> tags = new ArrayList<org.openapitools.client.model.Tag>();
+        org.openapitools.client.model.Tag tag1 = new org.openapitools.client.model.Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags((Arrays.asList("friendly")));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
+
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testUpdatePetWithForm() throws Exception {
+        Pet pet = createPet();
+        pet.setName("frank");
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    @Disabled
+    public void testDeletePet() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(pet.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (ApiException e) {
+            LOG.info("Code: {}. Message: {}", e.getCode(), e.getMessage());
+            assertEquals(404, e.getCode());
+        }
+    }
+
+    @Test
+    public void testUploadFile() throws Exception {
+        Pet pet = createPet();
+        api.addPet(pet);
+
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        // respect user supplied content type
+        ApiResponse formDataResponse = api.uploadFileWithHttpInfo(pet.getId(), "multipart/form-data", "a test file", new File(file.getAbsolutePath()));
+        assertEquals(200, formDataResponse.getStatusCode());
+
+        // use default content type
+        ApiResponse defaultResponse = api.uploadFileWithHttpInfo(pet.getId(), null, "a test file", new File(file.getAbsolutePath()));
+        assertEquals(200, defaultResponse.getStatusCode());
+
+        try {
+            // use invalid content type
+            api.uploadFileWithHttpInfo(pet.getId(), "image/jpeg", "a test file", new File(file.getAbsolutePath()));
+        } catch (ApiException e) {
+            LOG.info("Code: {}. Message: {}", e.getCode(), e.getMessage());
+            assertEquals(415, e.getCode());
+        }
+        
+        api.deletePet(pet.getId(), null);
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(
+                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(
+                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2")));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createPet() {
+        Pet pet = new Pet();
+        pet.setId(ThreadLocalRandom.current().nextLong(Long.MAX_VALUE));
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos =
+                (Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
+        pet.setPhotoUrls(photos);
+
+        return pet;
+    }
+
+    private String serializeJson(Object o, ApiClient apiClient) {
+        return apiClient.getJSON().serialize(o);
+    }
+
+    private <T> T deserializeJson(String json, Type type, ApiClient apiClient) {
+        return (T) apiClient.getJSON().deserialize(json, type);
+    }
+
+    private void assertPetMatches(Pet expected, Pet actual) {
+        assertNotNull(actual);
+        assertEquals(expected.getId(), actual.getId());
+        assertNotNull(actual.getCategory());
+        assertEquals(expected.getCategory().getName(), actual.getCategory().getName());
+    }
+
+    /**
+     * Assert that the given upload/download progress list satisfies the following constraints:
+     *
+     * <p>- List is not empty - Byte count should be nondecreasing - The last element, and only the
+     * last element, should have done=true
+     */
+    private void assertValidProgress(List<Progress> progressList) {
+        assertFalse(progressList.isEmpty());
+
+        Progress prev = null;
+        int index = 0;
+        for (Progress progress : progressList) {
+            if (prev != null) {
+                if (prev.done || prev.bytes > progress.bytes) {
+                    fail("Progress list out of order at index " + index + ": " + progressList);
+                }
+            }
+            prev = progress;
+            index += 1;
+        }
+
+        if (!prev.done) {
+            fail("Last progress item should have done=true: " + progressList);
+        }
+    }
+
+    private static class TestApiCallback<T> implements ApiCallback<T> {
+
+        private final CountDownLatch latch;
+        private final ConcurrentLinkedQueue<Progress> uploadProgress =
+                new ConcurrentLinkedQueue<Progress>();
+        private final ConcurrentLinkedQueue<Progress> downloadProgress =
+                new ConcurrentLinkedQueue<Progress>();
+
+        private boolean done;
+        private boolean success;
+        private ApiException exception;
+        private T result;
+
+        public TestApiCallback(CountDownLatch latch) {
+            this.latch = latch;
+            this.done = false;
+        }
+
+        @Override
+        public void onFailure(
+                ApiException e, int statusCode, Map<String, List<String>> responseHeaders) {
+            exception = e;
+            this.done = true;
+            this.success = false;
+            latch.countDown();
+        }
+
+        @Override
+        public void onSuccess(T result, int statusCode, Map<String, List<String>> responseHeaders) {
+            this.result = result;
+            this.done = true;
+            this.success = true;
+            latch.countDown();
+        }
+
+        @Override
+        public void onUploadProgress(long bytesWritten, long contentLength, boolean done) {
+            uploadProgress.add(new Progress(bytesWritten, contentLength, done));
+        }
+
+        @Override
+        public void onDownloadProgress(long bytesRead, long contentLength, boolean done) {
+            downloadProgress.add(new Progress(bytesRead, contentLength, done));
+        }
+
+        public boolean isDone() {
+            return done;
+        }
+
+        public boolean isSuccess() {
+            return success;
+        }
+
+        public ApiException getException() {
+            return exception;
+        }
+
+        public T getResult() {
+            return result;
+        }
+
+        public List<Progress> getUploadProgress() {
+            return new ArrayList<Progress>(uploadProgress);
+        }
+
+        public List<Progress> getDownloadProgress() {
+            return new ArrayList<Progress>(downloadProgress);
+        }
+    }
+
+    private static class Progress {
+        public final long bytes;
+        public final long contentLength;
+        public final boolean done;
+
+        public Progress(long bytes, long contentLength, boolean done) {
+            this.bytes = bytes;
+            this.contentLength = contentLength;
+            this.done = done;
+        }
+
+        @Override
+        public String toString() {
+            return "<Progress " + bytes + " " + contentLength + " " + done + ">";
+        }
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/StoreApiTest.java
index 98354ba10c08..b9c5785e5ca3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -2,30 +2,24 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * The version of the OpenAPI document: 1.0.0
- * 
+ * OpenAPI spec version: 1.0.0
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
-
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
-import org.openapitools.client.model.Order;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Order;
 
-/**
- * API tests for StoreApi
- */
+/** API tests for StoreApi */
 @Disabled
 public class StoreApiTest {
 
@@ -34,7 +28,8 @@ public class StoreApiTest {
     /**
      * Delete purchase order by ID
      *
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * <p>For valid response try integer IDs with value &lt; 1000. Anything above 1000 or
+     * nonintegers will generate API errors
      *
      * @throws ApiException if the Api call fails
      */
@@ -42,26 +37,29 @@ public class StoreApiTest {
     public void deleteOrderTest() throws ApiException {
         String orderId = null;
         api.deleteOrder(orderId);
+
         // TODO: test validations
     }
 
     /**
      * Returns pet inventories by status
      *
-     * Returns a map of status codes to quantities
+     * <p>Returns a map of status codes to quantities
      *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void getInventoryTest() throws ApiException {
         Map<String, Integer> response = api.getInventory();
+
         // TODO: test validations
     }
 
     /**
      * Find purchase order by ID
      *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generate exceptions
+     * <p>For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will
+     * generated exceptions
      *
      * @throws ApiException if the Api call fails
      */
@@ -69,21 +67,20 @@ public void getInventoryTest() throws ApiException {
     public void getOrderByIdTest() throws ApiException {
         Long orderId = null;
         Order response = api.getOrderById(orderId);
+
         // TODO: test validations
     }
 
     /**
      * Place an order for a pet
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void placeOrderTest() throws ApiException {
-        Order order = null;
-        Order response = api.placeOrder(order);
+        Order body = null;
+        Order response = api.placeOrder(body);
+
         // TODO: test validations
     }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/UserApiTest.java
index aa9aff49b4df..50a958f2fd01 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/UserApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -2,31 +2,24 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * The version of the OpenAPI document: 1.0.0
- * 
+ * OpenAPI spec version: 1.0.0
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
-
 package org.openapitools.client.api;
 
-import org.openapitools.client.ApiException;
-import java.time.OffsetDateTime;
-import org.openapitools.client.model.User;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.User;
 
-/**
- * API tests for UserApi
- */
+/** API tests for UserApi */
 @Disabled
 public class UserApiTest {
 
@@ -35,49 +28,48 @@ public class UserApiTest {
     /**
      * Create user
      *
-     * This can only be done by the logged in user.
+     * <p>This can only be done by the logged in user.
      *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void createUserTest() throws ApiException {
-        User user = null;
-        api.createUser(user);
+        User body = null;
+        api.createUser(body);
+
         // TODO: test validations
     }
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void createUsersWithArrayInputTest() throws ApiException {
-        List<User> user = null;
-        api.createUsersWithArrayInput(user);
+        List<User> body = null;
+        api.createUsersWithArrayInput(body);
+
         // TODO: test validations
     }
 
     /**
      * Creates list of users with given input array
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void createUsersWithListInputTest() throws ApiException {
-        List<User> user = null;
-        api.createUsersWithListInput(user);
+        List<User> body = null;
+        api.createUsersWithListInput(body);
+
         // TODO: test validations
     }
 
     /**
      * Delete user
      *
-     * This can only be done by the logged in user.
+     * <p>This can only be done by the logged in user.
      *
      * @throws ApiException if the Api call fails
      */
@@ -85,28 +77,26 @@ public void createUsersWithListInputTest() throws ApiException {
     public void deleteUserTest() throws ApiException {
         String username = null;
         api.deleteUser(username);
+
         // TODO: test validations
     }
 
     /**
      * Get user by user name
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void getUserByNameTest() throws ApiException {
         String username = null;
         User response = api.getUserByName(username);
+
         // TODO: test validations
     }
 
     /**
      * Logs user into the system
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
@@ -114,35 +104,35 @@ public void loginUserTest() throws ApiException {
         String username = null;
         String password = null;
         String response = api.loginUser(username, password);
+
         // TODO: test validations
     }
 
     /**
      * Logs out current logged in user session
      *
-     * 
-     *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void logoutUserTest() throws ApiException {
         api.logoutUser();
+
         // TODO: test validations
     }
 
     /**
      * Updated user
      *
-     * This can only be done by the logged in user.
+     * <p>This can only be done by the logged in user.
      *
      * @throws ApiException if the Api call fails
      */
     @Test
     public void updateUserTest() throws ApiException {
         String username = null;
-        User user = null;
-        api.updateUser(username, user);
+        User body = null;
+        api.updateUser(username, body);
+
         // TODO: test validations
     }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
new file mode 100644
index 000000000000..c4b8362967d0
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java
@@ -0,0 +1,119 @@
+package org.openapitools.client.auth;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header or cookie parameters
+        assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInQueryWithNullValue() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey(null);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+        assertEquals(0, cookieParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to query or cookie parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithNullValue() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInCookieWithPrefix() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to query or header parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+        assertEquals(1, cookieParams.size());
+        assertEquals("Token my-api-token", cookieParams.get("X-API-TOKEN"));
+    }
+
+    @Test
+    public void testApplyToParamsInCookieWithNullValue() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("cookie", "X-API-TOKEN");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+        assertEquals(0, headerParams.size());
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
new file mode 100644
index 000000000000..1230a9d9d2e9
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java
@@ -0,0 +1,65 @@
+package org.openapitools.client.auth;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.*;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @BeforeEach
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() throws ApiException {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+        Map<String, String> cookieParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+
+        // no changes to query or cookie parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, cookieParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic "
+        // prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username and password should be ignored
+        queryParams = new ArrayList<Pair>();
+        headerParams = new HashMap<String, String>();
+        auth.setUsername(null);
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams, cookieParams, null, null, null);
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
new file mode 100644
index 000000000000..13d9276a7874
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java
@@ -0,0 +1,124 @@
+package org.openapitools.client.auth;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.Collections;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import okhttp3.*;
+import okhttp3.Interceptor.Chain;
+import okhttp3.Response.Builder;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.oltu.oauth2.client.OAuthClient;
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
+import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public class RetryingOAuthTest {
+
+    private RetryingOAuth oauth;
+
+    @BeforeEach
+    public void setUp() throws Exception {
+        oauth =
+                new RetryingOAuth(
+                        "_clientId",
+                        "_clientSecret",
+                        OAuthFlow.ACCESS_CODE,
+                        "https://token.example.com",
+                        Collections.<String, String>emptyMap());
+        oauth.setAccessToken("expired-access-token");
+        FieldUtils.writeField(oauth, "oAuthClient", mockOAuthClient(), true);
+    }
+
+    @Test
+    public void testSingleRequestUnauthorized() throws Exception {
+        Response response = oauth.intercept(mockChain());
+        assertEquals(HttpURLConnection.HTTP_OK, response.code());
+    }
+
+    @Test
+    public void testTwoConcurrentRequestsUnauthorized() throws Exception {
+
+        Callable<Response> callable =
+                new Callable<Response>() {
+                    @Override
+                    public Response call() throws Exception {
+                        return oauth.intercept(mockChain());
+                    }
+                };
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            Future<Response> response1 = executor.submit(callable);
+            Future<Response> response2 = executor.submit(callable);
+
+            assertEquals(HttpURLConnection.HTTP_OK, response1.get().code());
+            assertEquals(HttpURLConnection.HTTP_OK, response2.get().code());
+        } finally {
+            executor.shutdown();
+        }
+    }
+
+    private OAuthClient mockOAuthClient() throws OAuthProblemException, OAuthSystemException {
+        OAuthJSONAccessTokenResponse response = mock(OAuthJSONAccessTokenResponse.class);
+        when(response.getAccessToken())
+                .thenAnswer(
+                        new Answer<String>() {
+                            @Override
+                            public String answer(InvocationOnMock invocation) throws Throwable {
+                                // sleep ensures that the bug is triggered.
+                                Thread.sleep(1000);
+                                return "new-access-token";
+                            }
+                        });
+
+        OAuthClient client = mock(OAuthClient.class);
+        when(client.accessToken(any(OAuthClientRequest.class))).thenReturn(response);
+        return client;
+    }
+
+    private Chain mockChain() throws IOException {
+        Chain chain = mock(Chain.class);
+
+        final Request request = new Request.Builder().url("https://api.example.com").build();
+        when(chain.request()).thenReturn(request);
+
+        when(chain.proceed(any(Request.class)))
+                .thenAnswer(
+                        new Answer<Response>() {
+                            @Override
+                            public Response answer(InvocationOnMock inv) {
+                                Request r = inv.getArgument(0);
+                                int responseCode =
+                                        "Bearer new-access-token".equals(r.header("Authorization"))
+                                                ? HttpURLConnection.HTTP_OK
+                                                : HttpURLConnection.HTTP_UNAUTHORIZED;
+                                return new Builder()
+                                        .protocol(Protocol.HTTP_1_0)
+                                        .message("sup")
+                                        .request(request)
+                                        .body(
+                                                ResponseBody.create(
+                                                        new byte[0],
+                                                        MediaType.get("application/test")))
+                                        .code(responseCode)
+                                        .build();
+                            }
+                        });
+
+        return chain;
+    }
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
index 4d17345a18e7..074e6add3cc7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -19,13 +19,13 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import org.openapitools.jackson.nullable.JsonNullable;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for AdditionalPropertiesClass
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
index cf8a581e8f44..089fe1a41581 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesCTest.java
@@ -19,7 +19,6 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -125,12 +124,4 @@ public void completeTest() {
         // TODO: test complete
     }
 
-    /**
-     * Test the property 'paymentMethod'
-     */
-    @Test
-    public void paymentMethodTest() {
-        // TODO: test paymentMethod
-    }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfTest.java
index b34067d86460..15cde8b947b5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AllOfModelArrayAnyOfTest.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.Arrays;
-import org.openapitools.client.model.AllOfModelArrayAnyOfAllOfAttributes;
 import org.openapitools.client.model.AllOfModelArrayAnyOfAllOfLinkListColumn1;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -63,12 +62,4 @@ public void linkListColumn1Test() {
         // TODO: test linkListColumn1
     }
 
-    /**
-     * Test the property 'attributes'
-     */
-    @Test
-    public void attributesTest() {
-        // TODO: test attributes
-    }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AnimalTest.java
index f30075833858..cc4678583018 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AnimalTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -19,10 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
+import org.openapitools.client.model.Cat;
+import org.openapitools.client.model.Dog;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Animal
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleReqTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleReqTest.java
index ab1caf49d1bb..772c2ac24bf3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleReqTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleReqTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for AppleReq
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleTest.java
index 0cde246f3dd8..1b9fd1706d46 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/AppleTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Apple
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerTest.java
index 0be94bcc3466..15817f98e222 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ArrayOfInlineAllOfArrayAllofDogPropertyInner
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfTest.java
index 385ead61ffe5..c887d6b4bc39 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInner;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ArrayOfInlineAllOf
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
index 7121b15da89f..8eb0bf5acd59 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -21,11 +21,11 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ArrayOfNumberOnly
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayTestTest.java
index da72462ec73d..63a98fbeff6d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayTestTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ArrayTest
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaReqTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaReqTest.java
index cf02d90b8c2c..30568207995f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaReqTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaReqTest.java
@@ -20,10 +20,10 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for BananaReq
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaTest.java
index 889087a653d4..10f407730718 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BananaTest.java
@@ -20,10 +20,10 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Banana
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BasquePigTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BasquePigTest.java
index b4e3ebde1882..0d9eec8e0f0b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BasquePigTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/BasquePigTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for BasquePig
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CapitalizationTest.java
index c3c69e049af7..51745e8a2214 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CapitalizationTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Capitalization
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CatTest.java
index f635d58df928..23ab7c6c9045 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CatTest.java
@@ -19,12 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
 import org.openapitools.client.model.Animal;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Cat
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CategoryTest.java
index 03f1c7ec1d53..30e7328449c0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CategoryTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Category
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClassModelTest.java
index 1666ebc79969..0e6956b33269 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClassModelTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ClassModel
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClientTest.java
index 140143b9573d..22c1e8596146 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClientTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Client
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ComplexQuadrilateralTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ComplexQuadrilateralTest.java
index ae249afb2a59..c544a3da00cb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ComplexQuadrilateralTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ComplexQuadrilateralTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ComplexQuadrilateral
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DanishPigTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DanishPigTest.java
index f1a269899574..2a265236c260 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DanishPigTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DanishPigTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for DanishPig
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
index 1b298f1bd159..bf3e5f6e21da 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for DeprecatedObject
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DogTest.java
index 844e3e06f5e1..99c282235ce9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DogTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DogTest.java
@@ -19,11 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Animal;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Dog
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DrawingTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DrawingTest.java
index d6834d1985e3..8232c871009b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DrawingTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DrawingTest.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Fruit;
 import org.openapitools.client.model.NullableShape;
@@ -30,6 +29,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Drawing
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumArraysTest.java
index 02954e6a6839..9ca44c3d5e53 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumArraysTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -20,11 +20,11 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for EnumArrays
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumClassTest.java
index bed8681219e8..88c982a61df2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumClassTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for EnumClass
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumStringDiscriminatorTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumStringDiscriminatorTest.java
index ef8bbbfac3f2..9d4c8e553954 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumStringDiscriminatorTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumStringDiscriminatorTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for EnumStringDiscriminator
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumTestTest.java
index 320df9ad3ebf..79bd51ad8532 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumTestTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -19,7 +19,6 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.OuterEnum;
 import org.openapitools.client.model.OuterEnumDefaultValue;
 import org.openapitools.client.model.OuterEnumInteger;
@@ -28,6 +27,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for EnumTest
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EquilateralTriangleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EquilateralTriangleTest.java
index 181c439fa18c..edd7afe14210 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EquilateralTriangleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EquilateralTriangleTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for EquilateralTriangle
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
index 79eccbf4beef..75af6c26a264 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ModelFile;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for FileSchemaTestClass
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
index 83fc00cea450..4e9ebc39952c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java
@@ -19,11 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Foo;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for FooGetDefaultResponse
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooTest.java
index 8dd27992bc1c..562b545ffb65 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FooTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Foo
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FormatTestTest.java
index e2b6ed61d88b..9e091ac1614d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FormatTestTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -23,11 +23,11 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.UUID;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for FormatTest
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitReqTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitReqTest.java
index d4bdb5f312ff..95ea123b1399 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitReqTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitReqTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.openapitools.client.model.AppleReq;
 import org.openapitools.client.model.BananaReq;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for FruitReq
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitTest.java
index bc4e5e54130d..bd7cd5827a4b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/FruitTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.openapitools.client.model.Apple;
 import org.openapitools.client.model.Banana;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Fruit
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GmFruitTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GmFruitTest.java
index 68c8179498de..03b9a54d490a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GmFruitTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GmFruitTest.java
@@ -20,12 +20,12 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.openapitools.client.model.Apple;
 import org.openapitools.client.model.Banana;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for GmFruit
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GrandparentAnimalTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GrandparentAnimalTest.java
index 8247ad12829b..dccfda8c772d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GrandparentAnimalTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/GrandparentAnimalTest.java
@@ -19,10 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
+import org.openapitools.client.model.ParentPet;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for GrandparentAnimal
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
index f63bf66b1775..12879ebf3951 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for HasOnlyReadOnly
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
index a6e06e3dbd8c..c424fb717e8e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/HealthCheckResultTest.java
@@ -19,11 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.jackson.nullable.JsonNullable;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for HealthCheckResult
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/IsoscelesTriangleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/IsoscelesTriangleTest.java
index 728d1af34f26..b45919dadadd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/IsoscelesTriangleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/IsoscelesTriangleTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for IsoscelesTriangle
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MammalTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MammalTest.java
index af5250405311..a2682988c72e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MammalTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MammalTest.java
@@ -19,13 +19,13 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Pig;
 import org.openapitools.client.model.Whale;
 import org.openapitools.client.model.Zebra;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Mammal
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MapTestTest.java
index 0587a961b146..f2515c398b94 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MapTestTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for MapTest
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
index 1cc69bedcd83..03df28593f69 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -28,6 +27,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for MixedPropertiesAndAdditionalPropertiesClass
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
index 01b44a53b4fa..aa3d6381861b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Model200Response
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
index 9480c9ee0ff7..3f61010629ae 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ModelApiResponse
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelFileTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelFileTest.java
index a84242272474..5e868346f88d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelFileTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelFileTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ModelFile
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelListTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelListTest.java
index ea5a55185989..8ec190bf5446 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelListTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelListTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ModelList
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelReturnTest.java
index 10c7841ba3c1..dae92f89a6c4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelReturnTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ModelReturn
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NameTest.java
index 52eae7974bc1..7086457d5cf7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NameTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NameTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Name
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NewPetTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NewPetTest.java
index dc4188473fd2..60bf0e74410b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NewPetTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NewPetTest.java
@@ -50,22 +50,6 @@ public void idTest() {
         // TODO: test id
     }
 
-    /**
-     * Test the property 'categoryRefToInlineAllofString'
-     */
-    @Test
-    public void categoryRefToInlineAllofStringTest() {
-        // TODO: test categoryRefToInlineAllofString
-    }
-
-    /**
-     * Test the property 'categoryInlineAllofString'
-     */
-    @Test
-    public void categoryInlineAllofStringTest() {
-        // TODO: test categoryInlineAllofString
-    }
-
     /**
      * Test the property 'categoryInlineAllof'
      */
@@ -82,22 +66,6 @@ public void categoryAllOfRefTest() {
         // TODO: test categoryAllOfRef
     }
 
-    /**
-     * Test the property 'categoryAllOfRefDescription'
-     */
-    @Test
-    public void categoryAllOfRefDescriptionTest() {
-        // TODO: test categoryAllOfRefDescription
-    }
-
-    /**
-     * Test the property 'categoryAllOfRefDescriptionReadonly'
-     */
-    @Test
-    public void categoryAllOfRefDescriptionReadonlyTest() {
-        // TODO: test categoryAllOfRefDescriptionReadonly
-    }
-
     /**
      * Test the property 'name'
      */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableClassTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableClassTest.java
index 0a0595ca0e65..1f72849e9f2e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableClassTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableClassTest.java
@@ -23,7 +23,6 @@
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +30,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for NullableClass
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableShapeTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableShapeTest.java
index dbc420fae72d..0026a5188e53 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableShapeTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NullableShapeTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for NullableShape
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
index 774200c9f6bc..b01e135a260c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -20,10 +20,10 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for NumberOnly
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
index 452495e83d31..0f59cf5baec5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ObjectWithDeprecatedFieldsTest.java
@@ -21,12 +21,12 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.DeprecatedObject;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ObjectWithDeprecatedFields
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
index 6fbe9280c058..9dff581d403e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -19,12 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Order
  */
@@ -87,12 +86,4 @@ public void completeTest() {
         // TODO: test complete
     }
 
-    /**
-     * Test the property 'paymentMethod'
-     */
-    @Test
-    public void paymentMethodTest() {
-        // TODO: test paymentMethod
-    }
-
 }
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
index 794328118065..3b6aa4c90338 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -20,10 +20,10 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for OuterComposite
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
index 6b324784e1d6..57ed09918adc 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumDefaultValueTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for OuterEnumDefaultValue
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
index ffb20a97973b..70cae81500e3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerDefaultValueTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for OuterEnumIntegerDefaultValue
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
index be0665bb740e..fc666e9da3bb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumIntegerTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for OuterEnumInteger
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumTest.java
index 8ab11b65cbde..61cb88bb3dba 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for OuterEnum
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ParentPetTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ParentPetTest.java
index 226366f49666..02011765f760 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ParentPetTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ParentPetTest.java
@@ -19,11 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.GrandparentAnimal;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ParentPet
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java
index a47d91415890..cbad73a0cdec 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetRefTest.java
@@ -19,11 +19,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -41,46 +37,6 @@ public void testPetRef() {
         // TODO: test PetRef
     }
 
-    /**
-     * Test the property 'id'
-     */
-    @Test
-    public void idTest() {
-        // TODO: test id
-    }
-
-    /**
-     * Test the property 'category'
-     */
-    @Test
-    public void categoryTest() {
-        // TODO: test category
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-    /**
-     * Test the property 'photoUrls'
-     */
-    @Test
-    public void photoUrlsTest() {
-        // TODO: test photoUrls
-    }
-
-    /**
-     * Test the property 'tags'
-     */
-    @Test
-    public void tagsTest() {
-        // TODO: test tags
-    }
-
     /**
      * Test the property 'status'
      */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java
new file mode 100644
index 000000000000..7939998e1a2f
--- /dev/null
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Model tests for Pet
+ */
+public class PetTest {
+    private final Pet model = new Pet();
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        // TODO: test Pet
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'category'
+     */
+    @Test
+    public void categoryTest() {
+        // TODO: test category
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'photoUrls'
+     */
+    @Test
+    public void photoUrlsTest() {
+        // TODO: test photoUrls
+    }
+
+    /**
+     * Test the property 'tags'
+     */
+    @Test
+    public void tagsTest() {
+        // TODO: test tags
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+}
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetWithRequiredTagsTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetWithRequiredTagsTest.java
index a338a337dc6d..e511e57ccd11 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetWithRequiredTagsTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetWithRequiredTagsTest.java
@@ -20,13 +20,13 @@
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for PetWithRequiredTags
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PigTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PigTest.java
index 43341a064965..c9682283bf91 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PigTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PigTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.BasquePig;
 import org.openapitools.client.model.DanishPig;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Pig
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralInterfaceTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralInterfaceTest.java
index 09636aa063b8..ef395cadb635 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralInterfaceTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralInterfaceTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for QuadrilateralInterface
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralTest.java
index 9615c3cddbee..ff4674d4cd38 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/QuadrilateralTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.ComplexQuadrilateral;
 import org.openapitools.client.model.SimpleQuadrilateral;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Quadrilateral
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
index c4b3c2a8d09d..28bbe600c7f3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ReadOnlyFirst
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ScaleneTriangleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ScaleneTriangleTest.java
index eaa8c5949fb2..38716e473983 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ScaleneTriangleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ScaleneTriangleTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ScaleneTriangle
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeInterfaceTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeInterfaceTest.java
index 5ca1df738506..bd20c12251af 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeInterfaceTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeInterfaceTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ShapeInterface
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeOrNullTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeOrNullTest.java
index c6897d03888f..0164b509cfd8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeOrNullTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeOrNullTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for ShapeOrNull
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeTest.java
index 90dcd3533662..3343750c59c1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ShapeTest.java
@@ -19,12 +19,12 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.Quadrilateral;
 import org.openapitools.client.model.Triangle;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Shape
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SimpleQuadrilateralTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SimpleQuadrilateralTest.java
index 4479450f2a90..b794d1cf052c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SimpleQuadrilateralTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SimpleQuadrilateralTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for SimpleQuadrilateral
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
index 49c1845b64ca..a61cb4663f26 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for SpecialModelName
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TagTest.java
index 6f38d0223841..4642d1e931d2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TagTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TagTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Tag
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleInterfaceTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleInterfaceTest.java
index 51c68d94db47..832f887bcf92 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleInterfaceTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleInterfaceTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for TriangleInterface
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleTest.java
index 92acf4e566cb..26267f88100a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/TriangleTest.java
@@ -19,13 +19,13 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.client.model.EquilateralTriangle;
 import org.openapitools.client.model.IsoscelesTriangle;
 import org.openapitools.client.model.ScaleneTriangle;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Triangle
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/UserTest.java
index eea5bbb3866d..225980e83662 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/UserTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/UserTest.java
@@ -19,11 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.openapitools.jackson.nullable.JsonNullable;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for User
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ValueTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ValueTest.java
index 69a85d2116cc..2d375187d814 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ValueTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ValueTest.java
@@ -13,7 +13,6 @@
 
 package org.openapitools.client.model;
 
-import java.util.List;
 import org.openapitools.client.model.Scalar;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/WhaleTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/WhaleTest.java
index 97bcae4987b4..5ef53c4ee1c9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/WhaleTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/WhaleTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Whale
  */
diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ZebraTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ZebraTest.java
index 73aa9b2b4e7a..a893fca3fe31 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ZebraTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ZebraTest.java
@@ -19,10 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+
 /**
  * Model tests for Zebra
  */
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java
index 9476edffbf91..9e3ea40c4366 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java
@@ -131,7 +131,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     private Integer value;
@@ -180,7 +180,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     private Double value;
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
index 467e2764f9d7..c97ec25e7efa 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -91,7 +91,7 @@ public static StatusEnum fromValue(String value) {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
 
     private BigDecimal value;
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java
index 9476edffbf91..9e3ea40c4366 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java
@@ -131,7 +131,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
 
 public enum EnumIntegerEnum {
 
-    NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     private Integer value;
@@ -180,7 +180,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
 
 public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     private Double value;
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
index 467e2764f9d7..c97ec25e7efa 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -91,7 +91,7 @@ public static StatusEnum fromValue(String value) {
 
 public enum PaymentMethodEnum {
 
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
 
     private BigDecimal value;

From 4fc56370497c77273f10a78754dc222c43117606 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:02:59 +0100
Subject: [PATCH 12/22] update faulty sample tests

---
 .../openapitools/client/api/FakeApiTest.java  |   4 +-
 .../AdditionalPropertiesAnyTypeTest.java      |  50 ----
 .../model/AdditionalPropertiesArrayTest.java  |  51 ----
 .../AdditionalPropertiesBooleanTest.java      |  50 ----
 .../AdditionalPropertiesIntegerTest.java      |  50 ----
 .../model/AdditionalPropertiesNumberTest.java |  51 ----
 .../model/AdditionalPropertiesObjectTest.java |  50 ----
 .../model/AdditionalPropertiesStringTest.java |  50 ----
 .../openapitools/client/model/OrderTest.java  |   9 +
 .../client/model/TypeHolderDefaultTest.java   |  83 ------
 .../client/model/TypeHolderExampleTest.java   |  91 ------
 .../client/model/XmlItemTest.java             | 275 ------------------
 .../openapitools/client/api/FakeApiTest.java  |   4 +-
 .../openapitools/client/model/OrderTest.java  |   9 +
 .../openapitools/client/api/FakeApiTest.java  |   4 +-
 .../openapitools/client/model/OrderTest.java  |   9 +
 .../openapitools/client/api/FakeApiTest.java  |   4 +-
 .../openapitools/client/model/OrderTest.java  |   9 +
 18 files changed, 48 insertions(+), 805 deletions(-)
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
 delete mode 100644 samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java

diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
index d334084203c5..276e85c2e9e8 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -267,7 +267,9 @@ public void testEnumParametersTest() throws ApiException {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
deleted file mode 100644
index 832d746f72d4..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesAnyType
- */
-public class AdditionalPropertiesAnyTypeTest {
-    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
-
-    /**
-     * Model tests for AdditionalPropertiesAnyType
-     */
-    @Test
-    public void testAdditionalPropertiesAnyType() {
-        // TODO: test AdditionalPropertiesAnyType
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
deleted file mode 100644
index d4426e578e49..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesArray
- */
-public class AdditionalPropertiesArrayTest {
-    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
-
-    /**
-     * Model tests for AdditionalPropertiesArray
-     */
-    @Test
-    public void testAdditionalPropertiesArray() {
-        // TODO: test AdditionalPropertiesArray
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
deleted file mode 100644
index 9df6e6291a6a..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesBoolean
- */
-public class AdditionalPropertiesBooleanTest {
-    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
-
-    /**
-     * Model tests for AdditionalPropertiesBoolean
-     */
-    @Test
-    public void testAdditionalPropertiesBoolean() {
-        // TODO: test AdditionalPropertiesBoolean
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
deleted file mode 100644
index 7fce2f458fff..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesInteger
- */
-public class AdditionalPropertiesIntegerTest {
-    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
-
-    /**
-     * Model tests for AdditionalPropertiesInteger
-     */
-    @Test
-    public void testAdditionalPropertiesInteger() {
-        // TODO: test AdditionalPropertiesInteger
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
deleted file mode 100644
index 3d98032d55a7..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesNumber
- */
-public class AdditionalPropertiesNumberTest {
-    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
-
-    /**
-     * Model tests for AdditionalPropertiesNumber
-     */
-    @Test
-    public void testAdditionalPropertiesNumber() {
-        // TODO: test AdditionalPropertiesNumber
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
deleted file mode 100644
index ad7d482159a3..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesObject
- */
-public class AdditionalPropertiesObjectTest {
-    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
-
-    /**
-     * Model tests for AdditionalPropertiesObject
-     */
-    @Test
-    public void testAdditionalPropertiesObject() {
-        // TODO: test AdditionalPropertiesObject
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
deleted file mode 100644
index e4bebcd23899..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for AdditionalPropertiesString
- */
-public class AdditionalPropertiesStringTest {
-    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
-
-    /**
-     * Model tests for AdditionalPropertiesString
-     */
-    @Test
-    public void testAdditionalPropertiesString() {
-        // TODO: test AdditionalPropertiesString
-    }
-
-    /**
-     * Test the property 'name'
-     */
-    @Test
-    public void nameTest() {
-        // TODO: test name
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
index 670c2535646b..635808e01f80 100644
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
@@ -85,4 +86,12 @@ void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
deleted file mode 100644
index 07eccf57ece7..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for TypeHolderDefault
- */
-public class TypeHolderDefaultTest {
-    private final TypeHolderDefault model = new TypeHolderDefault();
-
-    /**
-     * Model tests for TypeHolderDefault
-     */
-    @Test
-    public void testTypeHolderDefault() {
-        // TODO: test TypeHolderDefault
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
deleted file mode 100644
index 3ce00657e258..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for TypeHolderExample
- */
-public class TypeHolderExampleTest {
-    private final TypeHolderExample model = new TypeHolderExample();
-
-    /**
-     * Model tests for TypeHolderExample
-     */
-    @Test
-    public void testTypeHolderExample() {
-        // TODO: test TypeHolderExample
-    }
-
-    /**
-     * Test the property 'stringItem'
-     */
-    @Test
-    public void stringItemTest() {
-        // TODO: test stringItem
-    }
-
-    /**
-     * Test the property 'numberItem'
-     */
-    @Test
-    public void numberItemTest() {
-        // TODO: test numberItem
-    }
-
-    /**
-     * Test the property 'floatItem'
-     */
-    @Test
-    public void floatItemTest() {
-        // TODO: test floatItem
-    }
-
-    /**
-     * Test the property 'integerItem'
-     */
-    @Test
-    public void integerItemTest() {
-        // TODO: test integerItem
-    }
-
-    /**
-     * Test the property 'boolItem'
-     */
-    @Test
-    public void boolItemTest() {
-        // TODO: test boolItem
-    }
-
-    /**
-     * Test the property 'arrayItem'
-     */
-    @Test
-    public void arrayItemTest() {
-        // TODO: test arrayItem
-    }
-
-}
diff --git a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java
deleted file mode 100644
index 5dfb646e7f3f..000000000000
--- a/samples/client/petstore/java/apache-httpclient/src/test/java/org/openapitools/client/model/XmlItemTest.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-
-/**
- * Model tests for XmlItem
- */
-public class XmlItemTest {
-    private final XmlItem model = new XmlItem();
-
-    /**
-     * Model tests for XmlItem
-     */
-    @Test
-    public void testXmlItem() {
-        // TODO: test XmlItem
-    }
-
-    /**
-     * Test the property 'attributeString'
-     */
-    @Test
-    public void attributeStringTest() {
-        // TODO: test attributeString
-    }
-
-    /**
-     * Test the property 'attributeNumber'
-     */
-    @Test
-    public void attributeNumberTest() {
-        // TODO: test attributeNumber
-    }
-
-    /**
-     * Test the property 'attributeInteger'
-     */
-    @Test
-    public void attributeIntegerTest() {
-        // TODO: test attributeInteger
-    }
-
-    /**
-     * Test the property 'attributeBoolean'
-     */
-    @Test
-    public void attributeBooleanTest() {
-        // TODO: test attributeBoolean
-    }
-
-    /**
-     * Test the property 'wrappedArray'
-     */
-    @Test
-    public void wrappedArrayTest() {
-        // TODO: test wrappedArray
-    }
-
-    /**
-     * Test the property 'nameString'
-     */
-    @Test
-    public void nameStringTest() {
-        // TODO: test nameString
-    }
-
-    /**
-     * Test the property 'nameNumber'
-     */
-    @Test
-    public void nameNumberTest() {
-        // TODO: test nameNumber
-    }
-
-    /**
-     * Test the property 'nameInteger'
-     */
-    @Test
-    public void nameIntegerTest() {
-        // TODO: test nameInteger
-    }
-
-    /**
-     * Test the property 'nameBoolean'
-     */
-    @Test
-    public void nameBooleanTest() {
-        // TODO: test nameBoolean
-    }
-
-    /**
-     * Test the property 'nameArray'
-     */
-    @Test
-    public void nameArrayTest() {
-        // TODO: test nameArray
-    }
-
-    /**
-     * Test the property 'nameWrappedArray'
-     */
-    @Test
-    public void nameWrappedArrayTest() {
-        // TODO: test nameWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixString'
-     */
-    @Test
-    public void prefixStringTest() {
-        // TODO: test prefixString
-    }
-
-    /**
-     * Test the property 'prefixNumber'
-     */
-    @Test
-    public void prefixNumberTest() {
-        // TODO: test prefixNumber
-    }
-
-    /**
-     * Test the property 'prefixInteger'
-     */
-    @Test
-    public void prefixIntegerTest() {
-        // TODO: test prefixInteger
-    }
-
-    /**
-     * Test the property 'prefixBoolean'
-     */
-    @Test
-    public void prefixBooleanTest() {
-        // TODO: test prefixBoolean
-    }
-
-    /**
-     * Test the property 'prefixArray'
-     */
-    @Test
-    public void prefixArrayTest() {
-        // TODO: test prefixArray
-    }
-
-    /**
-     * Test the property 'prefixWrappedArray'
-     */
-    @Test
-    public void prefixWrappedArrayTest() {
-        // TODO: test prefixWrappedArray
-    }
-
-    /**
-     * Test the property 'namespaceString'
-     */
-    @Test
-    public void namespaceStringTest() {
-        // TODO: test namespaceString
-    }
-
-    /**
-     * Test the property 'namespaceNumber'
-     */
-    @Test
-    public void namespaceNumberTest() {
-        // TODO: test namespaceNumber
-    }
-
-    /**
-     * Test the property 'namespaceInteger'
-     */
-    @Test
-    public void namespaceIntegerTest() {
-        // TODO: test namespaceInteger
-    }
-
-    /**
-     * Test the property 'namespaceBoolean'
-     */
-    @Test
-    public void namespaceBooleanTest() {
-        // TODO: test namespaceBoolean
-    }
-
-    /**
-     * Test the property 'namespaceArray'
-     */
-    @Test
-    public void namespaceArrayTest() {
-        // TODO: test namespaceArray
-    }
-
-    /**
-     * Test the property 'namespaceWrappedArray'
-     */
-    @Test
-    public void namespaceWrappedArrayTest() {
-        // TODO: test namespaceWrappedArray
-    }
-
-    /**
-     * Test the property 'prefixNsString'
-     */
-    @Test
-    public void prefixNsStringTest() {
-        // TODO: test prefixNsString
-    }
-
-    /**
-     * Test the property 'prefixNsNumber'
-     */
-    @Test
-    public void prefixNsNumberTest() {
-        // TODO: test prefixNsNumber
-    }
-
-    /**
-     * Test the property 'prefixNsInteger'
-     */
-    @Test
-    public void prefixNsIntegerTest() {
-        // TODO: test prefixNsInteger
-    }
-
-    /**
-     * Test the property 'prefixNsBoolean'
-     */
-    @Test
-    public void prefixNsBooleanTest() {
-        // TODO: test prefixNsBoolean
-    }
-
-    /**
-     * Test the property 'prefixNsArray'
-     */
-    @Test
-    public void prefixNsArrayTest() {
-        // TODO: test prefixNsArray
-    }
-
-    /**
-     * Test the property 'prefixNsWrappedArray'
-     */
-    @Test
-    public void prefixNsWrappedArrayTest() {
-        // TODO: test prefixNsWrappedArray
-    }
-
-}
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 3604cb41b3d9..296221fd348b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -319,8 +319,10 @@ void testEnumParametersTest() {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
 
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/OrderTest.java
index 670c2535646b..635808e01f80 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
@@ -85,4 +86,12 @@ void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }
diff --git a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 3604cb41b3d9..296221fd348b 100644
--- a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -319,8 +319,10 @@ void testEnumParametersTest() {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
 
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/model/OrderTest.java
index 670c2535646b..635808e01f80 100644
--- a/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
@@ -85,4 +86,12 @@ void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }
diff --git a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 2004d3803671..d36947022f67 100644
--- a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -306,7 +306,9 @@ public void testEnumParametersTest(TestContext testContext) {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, result -> {
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, result -> {
             // TODO: test validations
             async.complete();
         });
diff --git a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/OrderTest.java
index 670c2535646b..635808e01f80 100644
--- a/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/OrderTest.java
+++ b/samples/client/petstore/java/vertx/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
@@ -85,4 +86,12 @@ void completeTest() {
         // TODO: test complete
     }
 
+    /**
+     * Test the property 'paymentMethod'
+     */
+    @Test
+    void paymentMethodTest() {
+        // TODO: test paymentMethod
+    }
+
 }

From 7e625515c1fa4580a920f6eed519e73ccaa05545 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:17:54 +0100
Subject: [PATCH 13/22] update faulty okhttp-gson test

---
 .../openapitools/client/api/FakeApiTest.java  | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 609fc9f0a40f..ab5cc50564f8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -16,10 +16,13 @@
 import org.openapitools.client.ApiException;
 import java.math.BigDecimal;
 import org.openapitools.client.model.Client;
+import org.openapitools.client.model.FakeRefParameterPetIdParameter;
 import java.io.File;
 import org.openapitools.client.model.FileSchemaTestClass;
+import org.openapitools.client.model.FreeFormObjectTestClass;
 import org.openapitools.client.model.HealthCheckResult;
 import java.time.LocalDate;
+import org.openapitools.client.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.OuterEnum;
@@ -41,6 +44,17 @@ public class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
 
+    /**
+     * Get a free form object or Json string
+     *
+     * @throws ApiException if the Api call fails
+     */
+    @Test
+    public void fakeGetFreeFormObjectGetTest() throws ApiException {
+        FreeFormObjectTestClass response = api.fakeGetFreeFormObjectGet();
+        // TODO: test validations
+    }
+
     /**
      * Test serialization of outer boolean types
      *
@@ -89,6 +103,36 @@ public void fakeOuterStringSerializeTest() throws ApiException {
         // TODO: test validations
     }
 
+    /**
+     * fake reference parameter
+     *
+     * 
+     *
+     * @throws ApiException if the Api call fails
+     */
+    @Test
+    public void fakeRefParameterTest() throws ApiException {
+        FakeRefParameterPetIdParameter petId = null;
+        api.fakeRefParameter(petId);
+        // TODO: test validations
+    }
+
+    /**
+     * fake reference parameter
+     *
+     * 
+     *
+     * @throws ApiException if the Api call fails
+     */
+    @Test
+    public void fakeUploadRefRequestBodiesTest() throws ApiException {
+        Long petId = null;
+        String additionalMetadata = null;
+        File _file = null;
+        ModelApiResponse response = api.fakeUploadRefRequestBodies(petId, additionalMetadata, _file);
+        // TODO: test validations
+    }
+
     /**
      * Array of Enums
      *
@@ -221,8 +265,7 @@ public void testEnumParametersTest() throws ApiException {
         List<String> enumFormStringArray = null;
         String enumFormString = null;
         Integer enumFormInteger = null;
-        Double enumFormDouble = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
         // TODO: test validations
     }
 

From 1b6cc4913c279a1a7865813e765b508aef455e59 Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:48:53 +0100
Subject: [PATCH 14/22] remove part that's problematic for ruby

---
 ...ith-fake-endpoints-models-for-testing.yaml | 12 ---
 .../java-helidon-client/v3/mp/docs/Order.md   | 10 ---
 .../org/openapitools/client/model/Order.java  | 48 ----------
 .../java-helidon-client/v3/se/docs/Order.md   | 10 ---
 .../org/openapitools/client/model/Order.java  | 48 ----------
 .../java-helidon-client/v4/mp/docs/Order.md   | 10 ---
 .../org/openapitools/client/model/Order.java  | 48 ----------
 .../java-helidon-client/v4/se/docs/Order.md   | 10 ---
 .../org/openapitools/client/model/Order.java  | 48 ----------
 .../java/apache-httpclient/api/openapi.yaml   | 13 ---
 .../java/apache-httpclient/docs/Order.md      | 10 ---
 .../org/openapitools/client/model/Order.java  | 84 +-----------------
 .../petstore/java/feign/api/openapi.yaml      | 13 ---
 .../org/openapitools/client/model/Order.java  | 75 +---------------
 .../docs/Order.md                             | 10 ---
 .../org/openapitools/client/model/Order.java  | 68 +-------------
 .../docs/Order.md                             | 10 ---
 .../org/openapitools/client/model/Order.java  | 75 +---------------
 .../microprofile-rest-client/docs/Order.md    | 10 ---
 .../org/openapitools/client/model/Order.java  | 75 +---------------
 .../java/restclient-swagger2/api/openapi.yaml | 13 ---
 .../java/restclient-swagger2/docs/Order.md    | 10 ---
 .../api/openapi.yaml                          | 13 ---
 .../docs/Order.md                             | 10 ---
 .../petstore/java/restclient/api/openapi.yaml | 13 ---
 .../petstore/java/restclient/docs/Order.md    | 10 ---
 .../petstore/java/resteasy/api/openapi.yaml   | 13 ---
 .../petstore/java/resteasy/docs/Order.md      | 10 ---
 .../org/openapitools/client/model/Order.java  | 74 +---------------
 .../resttemplate-withXml/api/openapi.yaml     | 13 ---
 .../java/resttemplate-withXml/docs/Order.md   | 10 ---
 .../java/resttemplate/api/openapi.yaml        | 13 ---
 .../petstore/java/resttemplate/docs/Order.md  | 10 ---
 .../petstore/java/vertx/api/openapi.yaml      | 13 ---
 .../client/petstore/java/vertx/docs/Order.md  | 10 ---
 .../org/openapitools/client/model/Order.java  | 74 +---------------
 .../java/webclient-jakarta/api/openapi.yaml   | 13 ---
 .../java/webclient-jakarta/docs/Order.md      | 10 ---
 .../java/webclient-swagger2/api/openapi.yaml  | 13 ---
 .../java/webclient-swagger2/docs/Order.md     | 10 ---
 .../petstore/java/webclient/api/openapi.yaml  | 13 ---
 .../petstore/java/webclient/docs/Order.md     | 10 ---
 .../petstore/ruby-autoload/docs/Order.md      |  4 +-
 .../lib/petstore/models/order.rb              | 32 +------
 .../petstore/ruby-faraday/docs/Order.md       |  4 +-
 .../ruby-faraday/lib/petstore/models/order.rb | 32 +------
 .../builds/default-v3.0/models/Order.ts       | 17 ----
 .../doc/Order.md                              |  1 -
 .../lib/src/model/order.dart                  | 43 +--------
 .../petstore_client_lib_fake/doc/Order.md     |  1 -
 .../lib/src/model/order.dart                  | 43 +--------
 .../petstore_client_lib_fake/doc/Order.md     |  1 -
 .../lib/model/order.dart                      | 88 +------------------
 samples/schema/petstore/mysql/Model/Order.sql |  6 +-
 .../schema/petstore/mysql/mysql_schema.sql    |  3 +-
 .../cpp-restbed/generated/3_0/model/Order.cpp | 21 -----
 .../cpp-restbed/generated/3_0/model/Order.h   |  7 --
 .../org/openapitools/server/model/Order.java  | 74 ----------------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../org/openapitools/server/model/Order.java  | 57 +-----------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../org/openapitools/server/model/Order.java  | 74 ----------------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../org/openapitools/server/model/Order.java  | 57 +-----------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../org/openapitools/server/model/Order.java  | 57 +-----------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../org/openapitools/server/model/Order.java  | 57 +-----------
 .../src/main/resources/META-INF/openapi.yml   | 13 ---
 .../mockserver/api/StoreApiMockServer.java    | 10 +--
 .../java/org/openapitools/model/Order.java    | 65 +-------------
 .../java/org/openapitools/model/Order.java    | 81 +----------------
 .../src/main/resources/META-INF/openapi.yaml  | 13 ---
 .../java/org/openapitools/model/Order.java    | 65 +-------------
 74 files changed, 54 insertions(+), 2002 deletions(-)

diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 7092e29ce33f..45dfa82225bb 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1434,18 +1434,6 @@ components:
         complete:
           type: boolean
           default: false
-        paymentMethod:
-          type: number
-          format: int32
-          description: "Various payment methods"
-          default: 1
-          example: 1
-          x-enum-description:
-            - Paypal
-            - Creditcard
-          enum:
-            - 1
-            - 2
       xml:
         name: Order
     Category:
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
index 88da61ce8993..84ce8e3fa1fb 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -61,32 +60,6 @@ public String toString() {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -207,26 +180,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -242,7 +195,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
index 88da61ce8993..84ce8e3fa1fb 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -61,32 +60,6 @@ public String toString() {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -207,26 +180,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -242,7 +195,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
index 88da61ce8993..84ce8e3fa1fb 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -61,32 +60,6 @@ public String toString() {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -207,26 +180,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -242,7 +195,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
index 88da61ce8993..84ce8e3fa1fb 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,7 +17,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -61,32 +60,6 @@ public String toString() {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -207,26 +180,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -242,7 +195,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
+++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/apache-httpclient/docs/Order.md b/samples/client/petstore/java/apache-httpclient/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/Order.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
index a3c874bcce9e..e14bfaf7f443 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -37,8 +36,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -103,45 +101,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -295,31 +254,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -334,13 +268,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -353,7 +286,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -461,16 +393,6 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
-    // add `paymentMethod` to the URL query string
-    if (getPaymentMethod() != null) {
-      try {
-        joiner.add(String.format("%spaymentMethod%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPaymentMethod()), "UTF-8").replaceAll("\\+", "%20")));
-      } catch (UnsupportedEncodingException e) {
-        // Should never happen, UTF-8 is always supported
-        throw new RuntimeException(e);
-      }
-    }
-
     return joiner.toString();
   }
 
diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/feign/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index 8be9fddac5a9..f7452464bfb2 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -298,32 +257,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
   }
 
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -338,13 +271,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -357,7 +289,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
index bc2204ee2642..4993c503e5f3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
index cbc6ed3a862b..271bd025d550 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -32,8 +31,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 
 public class Order  {
@@ -97,45 +95,6 @@ public static StatusEnum fromValue(String value) {
   
   private Boolean complete = false;
 
-  public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    @JsonValue
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    @JsonCreator
-        public static PaymentMethodEnum fromValue(BigDecimal value) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (b.value.equals(value)) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + value + "'");
-        }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
- /**
-  * Various payment methods
-  */
-  
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   /**
    * Get id
    * @return id
@@ -280,30 +239,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   **/
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-   * Set paymentMethod
-   */
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
   @Override
   public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
@@ -328,7 +263,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
index bc2204ee2642..4993c503e5f3 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
index 430cf33812d7..5a3f97ede37b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
@@ -14,7 +14,6 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
@@ -97,54 +96,6 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
-  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
-  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
-  public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
-        @Override
-        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(parser.getString())) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
-        }
-    }
-
-    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
-        @Override
-        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
-            generator.write(obj.value);
-        }
-    }
-  }
-
- /**
-  * Various payment methods
-  */
-  @JsonbProperty("paymentMethod")
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   /**
    * Get id
    * @return id
@@ -265,26 +216,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-   * Set paymentMethod
-   */
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -299,13 +230,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   /**
@@ -322,7 +252,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
index bc2204ee2642..4993c503e5f3 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index 4674a7755135..e8f48097237f 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -14,7 +14,6 @@
 
 import java.util.Objects;
 import java.util.Arrays;
-import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import javax.json.bind.annotation.JsonbTypeDeserializer;
@@ -94,54 +93,6 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
-  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
-  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
-  public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-
-    BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
-        @Override
-        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(parser.getString())) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
-        }
-    }
-
-    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
-        @Override
-        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
-            generator.write(obj.value);
-        }
-    }
-  }
-
- /**
-  * Various payment methods
-  */
-  @JsonbProperty("paymentMethod")
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   /**
    * Get id
    * @return id
@@ -262,26 +213,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-   * Set paymentMethod
-   */
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -296,13 +227,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   /**
@@ -319,7 +249,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/Order.md b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/restclient/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient/docs/Order.md b/samples/client/petstore/java/restclient/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/restclient/docs/Order.md
+++ b/samples/client/petstore/java/restclient/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/resteasy/api/openapi.yaml
+++ b/samples/client/petstore/java/resteasy/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resteasy/docs/Order.md b/samples/client/petstore/java/resteasy/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/resteasy/docs/Order.md
+++ b/samples/client/petstore/java/resteasy/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 6c5758e3911c..0e1782a89015 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -292,31 +251,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -331,13 +265,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -350,7 +283,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/resttemplate/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resttemplate/docs/Order.md b/samples/client/petstore/java/resttemplate/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/resttemplate/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/vertx/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/vertx/docs/Order.md b/samples/client/petstore/java/vertx/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/vertx/docs/Order.md
+++ b/samples/client/petstore/java/vertx/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 6c5758e3911c..0e1782a89015 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -292,31 +251,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -331,13 +265,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -350,7 +283,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/Order.md b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/Order.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/Order.md b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/webclient/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient/docs/Order.md b/samples/client/petstore/java/webclient/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/webclient/docs/Order.md
+++ b/samples/client/petstore/java/webclient/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/ruby-autoload/docs/Order.md b/samples/client/petstore/ruby-autoload/docs/Order.md
index 961b8605e8ea..a3fd55138068 100644
--- a/samples/client/petstore/ruby-autoload/docs/Order.md
+++ b/samples/client/petstore/ruby-autoload/docs/Order.md
@@ -10,7 +10,6 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
-| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
 
 ## Example
 
@@ -23,8 +22,7 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null,
-  payment_method: 1
+  complete: null
 )
 ```
 
diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
index 74d81f206c19..b18e3bb16d52 100644
--- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
@@ -28,9 +28,6 @@ class Order
 
     attr_accessor :complete
 
-    # Various payment methods
-    attr_accessor :payment_method
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -61,8 +58,7 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete',
-        :'payment_method' => :'paymentMethod'
+        :'complete' => :'complete'
       }
     end
 
@@ -84,8 +80,7 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean',
-        :'payment_method' => :'Float'
+        :'complete' => :'Boolean'
       }
     end
 
@@ -136,12 +131,6 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
-
-      if attributes.key?(:'payment_method')
-        self.payment_method = attributes[:'payment_method']
-      else
-        self.payment_method = PAYMENT_METHOD::N1
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -158,8 +147,6 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
-      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
-      return false unless payment_method_validator.valid?(@payment_method)
       true
     end
 
@@ -173,16 +160,6 @@ def status=(status)
       @status = status
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] payment_method Object to be assigned
-    def payment_method=(payment_method)
-      validator = EnumAttributeValidator.new('Float', [1, 2])
-      unless validator.valid?(payment_method)
-        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
-      end
-      @payment_method = payment_method
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -193,8 +170,7 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete &&
-          payment_method == o.payment_method
+          complete == o.complete
     end
 
     # @see the `==` method
@@ -206,7 +182,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete, payment_method].hash
+      [id, pet_id, quantity, ship_date, status, complete].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/ruby-faraday/docs/Order.md b/samples/client/petstore/ruby-faraday/docs/Order.md
index 961b8605e8ea..a3fd55138068 100644
--- a/samples/client/petstore/ruby-faraday/docs/Order.md
+++ b/samples/client/petstore/ruby-faraday/docs/Order.md
@@ -10,7 +10,6 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
-| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
 
 ## Example
 
@@ -23,8 +22,7 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null,
-  payment_method: 1
+  complete: null
 )
 ```
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
index 74d81f206c19..b18e3bb16d52 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
@@ -28,9 +28,6 @@ class Order
 
     attr_accessor :complete
 
-    # Various payment methods
-    attr_accessor :payment_method
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -61,8 +58,7 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete',
-        :'payment_method' => :'paymentMethod'
+        :'complete' => :'complete'
       }
     end
 
@@ -84,8 +80,7 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean',
-        :'payment_method' => :'Float'
+        :'complete' => :'Boolean'
       }
     end
 
@@ -136,12 +131,6 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
-
-      if attributes.key?(:'payment_method')
-        self.payment_method = attributes[:'payment_method']
-      else
-        self.payment_method = PAYMENT_METHOD::N1
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -158,8 +147,6 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
-      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
-      return false unless payment_method_validator.valid?(@payment_method)
       true
     end
 
@@ -173,16 +160,6 @@ def status=(status)
       @status = status
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] payment_method Object to be assigned
-    def payment_method=(payment_method)
-      validator = EnumAttributeValidator.new('Float', [1, 2])
-      unless validator.valid?(payment_method)
-        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
-      end
-      @payment_method = payment_method
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -193,8 +170,7 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete &&
-          payment_method == o.payment_method
+          complete == o.complete
     end
 
     # @see the `==` method
@@ -206,7 +182,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete, payment_method].hash
+      [id, pet_id, quantity, ship_date, status, complete].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
index e12ee981b009..2e9a77af0484 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
@@ -55,12 +55,6 @@ export interface Order {
      * @memberof Order
      */
     complete?: boolean;
-    /**
-     * Various payment methods
-     * @type {number}
-     * @memberof Order
-     */
-    paymentMethod?: OrderPaymentMethodEnum;
 }
 
 
@@ -74,15 +68,6 @@ export const OrderStatusEnum = {
 } as const;
 export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum];
 
-/**
- * @export
- */
-export const OrderPaymentMethodEnum = {
-    NUMBER_1: 1,
-    NUMBER_2: 2
-} as const;
-export type OrderPaymentMethodEnum = typeof OrderPaymentMethodEnum[keyof typeof OrderPaymentMethodEnum];
-
 
 /**
  * Check if a given object implements the Order interface.
@@ -107,7 +92,6 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
         'shipDate': json['shipDate'] == null ? undefined : (new Date(json['shipDate'])),
         'status': json['status'] == null ? undefined : json['status'],
         'complete': json['complete'] == null ? undefined : json['complete'],
-        'paymentMethod': json['paymentMethod'] == null ? undefined : json['paymentMethod'],
     };
 }
 
@@ -128,7 +112,6 @@ export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: bool
         'shipDate': value['shipDate'] == null ? undefined : ((value['shipDate']).toISOString()),
         'status': value['status'],
         'complete': value['complete'],
-        'paymentMethod': value['paymentMethod'],
     };
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
index a2529b10ff13..bde5ffe51a2c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
@@ -14,7 +14,6 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
-**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
index ae715ba0d441..dfbc4f5c5e41 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
@@ -29,8 +29,6 @@ class Order {
      this.status,
 
      this.complete = false,
-
-     this.paymentMethod = const OrderPaymentMethodEnum._(1),
   });
 
   @JsonKey(
@@ -107,20 +105,6 @@ class Order {
 
 
 
-      /// Various payment methods
-  @JsonKey(
-    defaultValue: 1,
-    name: r'paymentMethod',
-    required: false,
-    includeIfNull: false,
-  unknownEnumValue: OrderPaymentMethodEnum.unknownDefaultOpenApi,
-  )
-
-
-  final OrderPaymentMethodEnum? paymentMethod;
-
-
-
 
 
     @override
@@ -130,8 +114,7 @@ class Order {
       other.quantity == quantity &&
       other.shipDate == shipDate &&
       other.status == status &&
-      other.complete == complete &&
-      other.paymentMethod == paymentMethod;
+      other.complete == complete;
 
     @override
     int get hashCode =>
@@ -140,8 +123,7 @@ class Order {
         quantity.hashCode +
         shipDate.hashCode +
         status.hashCode +
-        complete.hashCode +
-        paymentMethod.hashCode;
+        complete.hashCode;
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 
@@ -178,24 +160,3 @@ String toString() => value;
 }
 
 
-/// Various payment methods
-enum OrderPaymentMethodEnum {
-    /// Various payment methods
-@JsonValue('1')
-n1(''1''),
-    /// Various payment methods
-@JsonValue('2')
-n2(''2''),
-    /// Various payment methods
-@JsonValue('11184809')
-unknownDefaultOpenApi(''11184809'');
-
-const OrderPaymentMethodEnum(this.value);
-
-final String value;
-
-@override
-String toString() => value;
-}
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
index a2529b10ff13..bde5ffe51a2c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
@@ -14,7 +14,6 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
-**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
index 08f0e5d5508c..a44e1b340c1e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
@@ -18,7 +18,6 @@ part 'order.g.dart';
 /// * [shipDate] 
 /// * [status] - Order Status
 /// * [complete] 
-/// * [paymentMethod] - Various payment methods
 @BuiltValue()
 abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'id')
@@ -41,19 +40,13 @@ abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'complete')
   bool? get complete;
 
-  /// Various payment methods
-  @BuiltValueField(wireName: r'paymentMethod')
-  OrderPaymentMethodEnum? get paymentMethod;
-  // enum paymentMethodEnum {  1,  2,  };
-
   Order._();
 
   factory Order([void updates(OrderBuilder b)]) = _$Order;
 
   @BuiltValueHook(initializeBuilder: true)
   static void _defaults(OrderBuilder b) => b
-      ..complete = false
-      ..paymentMethod = const OrderPaymentMethodEnum._(1);
+      ..complete = false;
 
   @BuiltValueSerializer(custom: true)
   static Serializer<Order> get serializer => _$OrderSerializer();
@@ -113,13 +106,6 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
         specifiedType: const FullType(bool),
       );
     }
-    if (object.paymentMethod != null) {
-      yield r'paymentMethod';
-      yield serializers.serialize(
-        object.paymentMethod,
-        specifiedType: const FullType(OrderPaymentMethodEnum),
-      );
-    }
   }
 
   @override
@@ -185,13 +171,6 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
           ) as bool;
           result.complete = valueDes;
           break;
-        case r'paymentMethod':
-          final valueDes = serializers.deserialize(
-            value,
-            specifiedType: const FullType(OrderPaymentMethodEnum),
-          ) as OrderPaymentMethodEnum;
-          result.paymentMethod = valueDes;
-          break;
         default:
           unhandled.add(key);
           unhandled.add(value);
@@ -244,23 +223,3 @@ class OrderStatusEnum extends EnumClass {
   static OrderStatusEnum valueOf(String name) => _$orderStatusEnumValueOf(name);
 }
 
-class OrderPaymentMethodEnum extends EnumClass {
-
-  /// Various payment methods
-  @BuiltValueEnumConst(wireName: r'1')
-  static const OrderPaymentMethodEnum n1 = _$orderPaymentMethodEnum_n1;
-  /// Various payment methods
-  @BuiltValueEnumConst(wireName: r'2')
-  static const OrderPaymentMethodEnum n2 = _$orderPaymentMethodEnum_n2;
-  /// Various payment methods
-  @BuiltValueEnumConst(wireName: r'11184809', fallback: true)
-  static const OrderPaymentMethodEnum unknownDefaultOpenApi = _$orderPaymentMethodEnum_unknownDefaultOpenApi;
-
-  static Serializer<OrderPaymentMethodEnum> get serializer => _$orderPaymentMethodEnumSerializer;
-
-  const OrderPaymentMethodEnum._(String name): super(name);
-
-  static BuiltSet<OrderPaymentMethodEnum> get values => _$orderPaymentMethodEnumValues;
-  static OrderPaymentMethodEnum valueOf(String name) => _$orderPaymentMethodEnumValueOf(name);
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
index a2529b10ff13..bde5ffe51a2c 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
@@ -14,7 +14,6 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
-**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
index f9be19503afa..bc591de9fab9 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
@@ -19,7 +19,6 @@ class Order {
     this.shipDate,
     this.status,
     this.complete = false,
-    this.paymentMethod = const OrderPaymentMethodEnum._(1),
   });
 
   ///
@@ -59,9 +58,6 @@ class Order {
 
   bool complete;
 
-  /// Various payment methods
-  OrderPaymentMethodEnum paymentMethod;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is Order &&
     other.id == id &&
@@ -69,8 +65,7 @@ class Order {
     other.quantity == quantity &&
     other.shipDate == shipDate &&
     other.status == status &&
-    other.complete == complete &&
-    other.paymentMethod == paymentMethod;
+    other.complete == complete;
 
   @override
   int get hashCode =>
@@ -80,11 +75,10 @@ class Order {
     (quantity == null ? 0 : quantity!.hashCode) +
     (shipDate == null ? 0 : shipDate!.hashCode) +
     (status == null ? 0 : status!.hashCode) +
-    (complete.hashCode) +
-    (paymentMethod.hashCode);
+    (complete.hashCode);
 
   @override
-  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete, paymentMethod=$paymentMethod]';
+  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -114,7 +108,6 @@ class Order {
       json[r'status'] = null;
     }
       json[r'complete'] = this.complete;
-      json[r'paymentMethod'] = this.paymentMethod;
     return json;
   }
 
@@ -143,7 +136,6 @@ class Order {
         shipDate: mapDateTime(json, r'shipDate', r''),
         status: OrderStatusEnum.fromJson(json[r'status']),
         complete: mapValueOfType<bool>(json, r'complete') ?? false,
-        paymentMethod: OrderPaymentMethodEnum.parse('${json[r'paymentMethod']}'),
       );
     }
     return null;
@@ -271,77 +263,3 @@ class OrderStatusEnumTypeTransformer {
 }
 
 
-/// Various payment methods
-class OrderPaymentMethodEnum {
-  /// Instantiate a new enum with the provided [value].
-  const OrderPaymentMethodEnum._(this.value);
-
-  /// The underlying value of this enum member.
-  final num value;
-
-  @override
-  String toString() => value.toString();
-
-  num toJson() => value;
-
-  static const n1 = OrderPaymentMethodEnum._('1');
-  static const n2 = OrderPaymentMethodEnum._('2');
-
-  /// List of all possible values in this [enum][OrderPaymentMethodEnum].
-  static const values = <OrderPaymentMethodEnum>[
-    n1,
-    n2,
-  ];
-
-  static OrderPaymentMethodEnum? fromJson(dynamic value) => OrderPaymentMethodEnumTypeTransformer().decode(value);
-
-  static List<OrderPaymentMethodEnum> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <OrderPaymentMethodEnum>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = OrderPaymentMethodEnum.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-}
-
-/// Transformation class that can [encode] an instance of [OrderPaymentMethodEnum] to num,
-/// and [decode] dynamic data back to [OrderPaymentMethodEnum].
-class OrderPaymentMethodEnumTypeTransformer {
-  factory OrderPaymentMethodEnumTypeTransformer() => _instance ??= const OrderPaymentMethodEnumTypeTransformer._();
-
-  const OrderPaymentMethodEnumTypeTransformer._();
-
-  num encode(OrderPaymentMethodEnum data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a OrderPaymentMethodEnum.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  OrderPaymentMethodEnum? decode(dynamic data, {bool allowNull = true}) {
-    if (data != null) {
-      switch (data) {
-        case '1': return OrderPaymentMethodEnum.n1;
-        case '2': return OrderPaymentMethodEnum.n2;
-        default:
-          if (!allowNull) {
-            throw ArgumentError('Unknown enum value to decode: $data');
-          }
-      }
-    }
-    return null;
-  }
-
-  /// Singleton [OrderPaymentMethodEnumTypeTransformer] instance.
-  static OrderPaymentMethodEnumTypeTransformer? _instance;
-}
-
-
diff --git a/samples/schema/petstore/mysql/Model/Order.sql b/samples/schema/petstore/mysql/Model/Order.sql
index 22efa6800382..43af471ffb5c 100644
--- a/samples/schema/petstore/mysql/Model/Order.sql
+++ b/samples/schema/petstore/mysql/Model/Order.sql
@@ -7,17 +7,17 @@
 --
 -- SELECT template for table `Order`
 --
-SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod` FROM `Order` WHERE 1;
+SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete` FROM `Order` WHERE 1;
 
 --
 -- INSERT template for table `Order`
 --
-INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`) VALUES (?, ?, ?, ?, ?, ?, ?);
+INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`) VALUES (?, ?, ?, ?, ?, ?);
 
 --
 -- UPDATE template for table `Order`
 --
-UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ?, `paymentMethod` = ? WHERE 1;
+UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ? WHERE 1;
 
 --
 -- DELETE template for table `Order`
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index 5783c0f0d693..0c526bdabd3e 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -352,8 +352,7 @@ CREATE TABLE IF NOT EXISTS `Order` (
   `quantity` INT DEFAULT NULL,
   `shipDate` DATETIME DEFAULT NULL,
   `status` ENUM('placed', 'approved', 'delivered') DEFAULT NULL COMMENT 'Order Status',
-  `complete` TINYINT(1) DEFAULT false,
-  `paymentMethod` ENUM('1', '2') DEFAULT '1' COMMENT 'Various payment methods'
+  `complete` TINYINT(1) DEFAULT false
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
index 261b1fe68fe8..e1fb8817f3ba 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
@@ -69,7 +69,6 @@ ptree Order::toPropertyTree() const
 	pt.put("shipDate", m_ShipDate);
 	pt.put("status", m_Status);
 	pt.put("complete", m_Complete);
-	pt.put("paymentMethod", m_PaymentMethod);
 	return pt;
 }
 
@@ -82,7 +81,6 @@ void Order::fromPropertyTree(ptree const &pt)
 	m_ShipDate = pt.get("shipDate", "");
 	setStatus(pt.get("status", ""));
 	m_Complete = pt.get("complete", false);
-	setPaymentMethod(pt.get("paymentMethod", 1));
 }
 
 int64_t Order::getId() const
@@ -159,25 +157,6 @@ void Order::setComplete(bool value)
 }
 
 
-double Order::getPaymentMethod() const
-{
-    return m_PaymentMethod;
-}
-
-void Order::setPaymentMethod(double value)
-{
-    static const std::array<double, 2> allowedValues = {
-        1, 2
-    };
-
-    if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) {
-		m_PaymentMethod = value;
-	} else {
-		throw std::runtime_error("Value " + boost::lexical_cast<std::string>(value) + " not allowed");
-	}
-}
-
-
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json)
 {
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
index e58f70608637..eccfec8de093 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
@@ -94,12 +94,6 @@ class  Order
     bool isComplete() const;
     void setComplete(bool value);
 
-    /// <summary>
-    /// Various payment methods
-    /// </summary>
-    double getPaymentMethod() const;
-    void setPaymentMethod(double value);
-
 protected:
     int64_t m_Id = 0L;
     int64_t m_PetId = 0L;
@@ -107,7 +101,6 @@ class  Order
     std::string m_ShipDate = "";
     std::string m_Status = "";
     bool m_Complete = false;
-    double m_PaymentMethod = 1;
 };
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json);
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
index c97ec25e7efa..707cdd3797f9 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,7 +14,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -89,58 +88,6 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-
-    private BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    /**
-     * Convert a String into BigDecimal, as specified in the
-     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
-     */
-    public static PaymentMethodEnum fromString(String s) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            // using Objects.toString() to be safe if value type non-object type
-            // because types like 'int' etc. will be auto-boxed
-            if (java.util.Objects.toString(b.value).equals(s)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            if (b.value.equals(value)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -261,26 +208,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -296,7 +223,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
index 7c9e262257fc..0ca5e240f6f6 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -56,44 +55,6 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
-    /**
-    * Various payment methods
-    */
-    public enum PaymentMethodEnum {
-        NUMBER_1(new BigDecimal("1")),
-        NUMBER_2(new BigDecimal("2"));
-
-        private BigDecimal value;
-
-        PaymentMethodEnum(BigDecimal value) {
-            this.value = value;
-        }
-
-        @JsonValue
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-
-        @JsonCreator
-        public static PaymentMethodEnum fromValue(String text) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + text + "'");
-        }
-    }
-
-
-    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
     /**
      * Default constructor.
      */
@@ -110,7 +71,6 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
-     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -118,8 +78,7 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete, 
-        PaymentMethodEnum paymentMethod
+        Boolean complete
     ) {
         this.id = id;
         this.petId = petId;
@@ -127,7 +86,6 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
-        this.paymentMethod = paymentMethod;
     }
 
 
@@ -204,18 +162,6 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
-    /**
-     * Various payment methods
-     * @return paymentMethod
-     */
-    public PaymentMethodEnum getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
     /**
       * Create a string representation of this pojo.
     **/
@@ -230,7 +176,6 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
index c97ec25e7efa..707cdd3797f9 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,7 +14,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -89,58 +88,6 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
-public enum PaymentMethodEnum {
-
-    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
-
-
-    private BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    /**
-     * Convert a String into BigDecimal, as specified in the
-     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
-     */
-    public static PaymentMethodEnum fromString(String s) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            // using Objects.toString() to be safe if value type non-object type
-            // because types like 'int' etc. will be auto-boxed
-            if (java.util.Objects.toString(b.value).equals(s)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            if (b.value.equals(value)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-}
-
- /**
-   * Various payment methods
-  **/
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
  /**
    * Get id
    * @return id
@@ -261,26 +208,6 @@ public Order complete(Boolean complete) {
     return this;
   }
 
- /**
-   * Various payment methods
-   * @return paymentMethod
-  **/
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  /**
-    * Set paymentMethod
-  **/
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
 
   /**
     * Create a string representation of this pojo.
@@ -296,7 +223,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
index 7c9e262257fc..0ca5e240f6f6 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -56,44 +55,6 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
-    /**
-    * Various payment methods
-    */
-    public enum PaymentMethodEnum {
-        NUMBER_1(new BigDecimal("1")),
-        NUMBER_2(new BigDecimal("2"));
-
-        private BigDecimal value;
-
-        PaymentMethodEnum(BigDecimal value) {
-            this.value = value;
-        }
-
-        @JsonValue
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-
-        @JsonCreator
-        public static PaymentMethodEnum fromValue(String text) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + text + "'");
-        }
-    }
-
-
-    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
     /**
      * Default constructor.
      */
@@ -110,7 +71,6 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
-     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -118,8 +78,7 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete, 
-        PaymentMethodEnum paymentMethod
+        Boolean complete
     ) {
         this.id = id;
         this.petId = petId;
@@ -127,7 +86,6 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
-        this.paymentMethod = paymentMethod;
     }
 
 
@@ -204,18 +162,6 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
-    /**
-     * Various payment methods
-     * @return paymentMethod
-     */
-    public PaymentMethodEnum getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
     /**
       * Create a string representation of this pojo.
     **/
@@ -230,7 +176,6 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
index 7c9e262257fc..0ca5e240f6f6 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -56,44 +55,6 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
-    /**
-    * Various payment methods
-    */
-    public enum PaymentMethodEnum {
-        NUMBER_1(new BigDecimal("1")),
-        NUMBER_2(new BigDecimal("2"));
-
-        private BigDecimal value;
-
-        PaymentMethodEnum(BigDecimal value) {
-            this.value = value;
-        }
-
-        @JsonValue
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-
-        @JsonCreator
-        public static PaymentMethodEnum fromValue(String text) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + text + "'");
-        }
-    }
-
-
-    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
     /**
      * Default constructor.
      */
@@ -110,7 +71,6 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
-     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -118,8 +78,7 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete, 
-        PaymentMethodEnum paymentMethod
+        Boolean complete
     ) {
         this.id = id;
         this.petId = petId;
@@ -127,7 +86,6 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
-        this.paymentMethod = paymentMethod;
     }
 
 
@@ -204,18 +162,6 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
-    /**
-     * Various payment methods
-     * @return paymentMethod
-     */
-    public PaymentMethodEnum getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
     /**
       * Create a string representation of this pojo.
     **/
@@ -230,7 +176,6 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
index 7c9e262257fc..0ca5e240f6f6 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -56,44 +55,6 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
-    /**
-    * Various payment methods
-    */
-    public enum PaymentMethodEnum {
-        NUMBER_1(new BigDecimal("1")),
-        NUMBER_2(new BigDecimal("2"));
-
-        private BigDecimal value;
-
-        PaymentMethodEnum(BigDecimal value) {
-            this.value = value;
-        }
-
-        @JsonValue
-        public BigDecimal getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return String.valueOf(value);
-        }
-
-
-        @JsonCreator
-        public static PaymentMethodEnum fromValue(String text) {
-            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-                if (String.valueOf(b.value).equals(text)) {
-                    return b;
-                }
-            }
-            throw new IllegalArgumentException("Unexpected value '" + text + "'");
-        }
-    }
-
-
-    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
     /**
      * Default constructor.
      */
@@ -110,7 +71,6 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
-     * @param paymentMethod Various payment methods
      */
     public Order(
         Long id, 
@@ -118,8 +78,7 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete, 
-        PaymentMethodEnum paymentMethod
+        Boolean complete
     ) {
         this.id = id;
         this.petId = petId;
@@ -127,7 +86,6 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
-        this.paymentMethod = paymentMethod;
     }
 
 
@@ -204,18 +162,6 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
-    /**
-     * Various payment methods
-     * @return paymentMethod
-     */
-    public PaymentMethodEnum getPaymentMethod() {
-        return paymentMethod;
-    }
-
-    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-        this.paymentMethod = paymentMethod;
-    }
-
     /**
       * Create a string representation of this pojo.
     **/
@@ -230,7 +176,6 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
index 050ac62d0522..d0bbfe56d0fd 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
index c4dce1da28c8..20c5aa09078a 100644
--- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
+++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
@@ -131,10 +131,10 @@ public static MappingBuilder stubGetOrderByIdFault(@javax.annotation.Nonnull Str
     }
 
     public static String getOrderById200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String getOrderById200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
     }
 
 
@@ -180,14 +180,14 @@ public static MappingBuilder stubPlaceOrderFault(@javax.annotation.Nonnull Strin
     }
 
     public static String placeOrder200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String placeOrder200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
     }
 
     public static String placeOrderRequestSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
 
 
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 8cc6c9ad7c73..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
@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import javax.validation.constraints.*;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -100,41 +98,6 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -255,26 +218,6 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   **/
-  @JsonProperty(value = "paymentMethod")
-  @ApiModelProperty(example = "1", value = "Various payment methods")
-  
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -290,13 +233,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -310,7 +252,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
index 1d71aad52207..64044f795460 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
@@ -1,6 +1,5 @@
 package org.openapitools.model;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import javax.validation.constraints.*;
@@ -71,54 +70,6 @@ public static StatusEnum fromValue(String value) {
 
   private StatusEnum status;
   private Boolean complete = false;
-  public enum PaymentMethodEnum {
-
-    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
-
-
-    private BigDecimal value;
-
-    PaymentMethodEnum (BigDecimal v) {
-        value = v;
-    }
-
-    public BigDecimal value() {
-        return value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-        return String.valueOf(value);
-    }
-
-    /**
-     * Convert a String into BigDecimal, as specified in the
-     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
-     */
-    public static PaymentMethodEnum fromString(String s) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            // using Objects.toString() to be safe if value type non-object type
-            // because types like 'int' etc. will be auto-boxed
-            if (java.util.Objects.toString(b.value).equals(s)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-            if (b.value.equals(value)) {
-                return b;
-            }
-        }
-        throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-}
-
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
 
   protected Order(OrderBuilder<?, ?> b) {
     this.id = b.id;
@@ -127,7 +78,6 @@ protected Order(OrderBuilder<?, ?> b) {
     this.shipDate = b.shipDate;
     this.status = b.status;
     this.complete = b.complete;
-    this.paymentMethod = b.paymentMethod;
   }
 
   public Order() {
@@ -248,26 +198,6 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
-  /**
-   * Various payment methods
-   **/
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  
-  @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1", description = "Various payment methods")
-  @JsonProperty("paymentMethod")
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  @JsonProperty("paymentMethod")
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -283,13 +213,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -303,7 +232,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -344,7 +272,6 @@ public static abstract class OrderBuilder<C extends Order, B extends OrderBuilde
     private LocalDateTime shipDate;
     private StatusEnum status;
     private Boolean complete = false;
-    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
     protected abstract B self();
 
     public abstract C build();
@@ -373,10 +300,6 @@ public B complete(Boolean complete) {
       this.complete = complete;
       return self();
     }
-    public B paymentMethod(PaymentMethodEnum paymentMethod) {
-      this.paymentMethod = paymentMethod;
-      return self();
-    }
   }
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
index 1ec770aa1ea8..b3e702a2e0fe 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
@@ -1528,7 +1528,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1556,18 +1555,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
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 35739f481fe0..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
@@ -18,7 +18,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import jakarta.validation.constraints.*;
@@ -33,8 +32,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -99,41 +97,6 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -254,26 +217,6 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   **/
-  @JsonProperty(value = "paymentMethod")
-  @Schema(example = "1", description = "Various payment methods")
-  
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -289,13 +232,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -309,7 +251,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }

From d83fe09ff802b943594f3e0e739b10e221610358 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 8 Apr 2025 16:27:46 +0200
Subject: [PATCH 15/22] Generate samples

---
 .../org/openapitools/client/model/Order.java  | 81 +-----------------
 .../org/openapitools/client/model/Order.java  | 84 ++-----------------
 .../org/openapitools/client/model/Order.java  | 74 +---------------
 .../org/openapitools/client/model/Order.java  | 75 +----------------
 .../api/openapi.yaml                          | 13 ---
 .../docs/Order.md                             | 10 ---
 .../org/openapitools/client/model/Order.java  | 74 +---------------
 .../org/openapitools/client/model/Order.java  | 74 +---------------
 .../php-laravel/.openapi-generator/FILES      |  1 -
 .../petstore/php-laravel/Model/Order.php      |  4 -
 10 files changed, 20 insertions(+), 470 deletions(-)

diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index 04ac44e98953..4310a4b7fd74 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -38,8 +37,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 @XmlRootElement(name = "Order")
@@ -119,50 +117,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  @XmlType(name="PaymentMethodEnum")
-  @XmlEnum(BigDecimal.class)
-  public enum PaymentMethodEnum {
-    @XmlEnumValue(new BigDecimal("1"))
-    NUMBER_1(new BigDecimal("1")),
-    
-    @XmlEnumValue(new BigDecimal("2"))
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @XmlElement(name = "paymentMethod")
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -328,33 +282,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "paymentMethod")
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "paymentMethod")
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -370,13 +297,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -389,7 +315,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index ef20c271bc01..bcff63f2a6bd 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,59 +98,19 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
   /**
    * Constructor with all args parameters
    */
-  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete, @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) PaymentMethodEnum paymentMethod) {
+  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
     this.id = id;
     this.petId = petId;
     this.quantity = quantity;
     this.shipDate = shipDate;
     this.status = status;
     this.complete = complete;
-    this.paymentMethod = paymentMethod;
   }
 
   public Order id(@javax.annotation.Nullable Long id) {
@@ -305,31 +263,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -345,13 +278,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -364,7 +296,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -416,10 +347,6 @@ public Order.Builder complete(Boolean complete) {
       this.instance.complete = complete;
       return this;
     }
-    public Order.Builder paymentMethod(PaymentMethodEnum paymentMethod) {
-      this.instance.paymentMethod = paymentMethod;
-      return this;
-    }
 
 
     /**
@@ -459,8 +386,7 @@ public Order.Builder toBuilder() {
       .quantity(getQuantity())
       .shipDate(getShipDate())
       .status(getStatus())
-      .complete(getComplete())
-      .paymentMethod(getPaymentMethod());
+      .complete(getComplete());
   }
 
 
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
index cce369f99c2a..a314bb8d5294 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @jakarta.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -292,31 +251,6 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -332,13 +266,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -351,7 +284,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index d5258f4367eb..4de247cdc05e 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -21,7 +21,6 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -35,8 +34,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -101,45 +99,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -299,32 +258,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods")
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -340,13 +273,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -359,7 +291,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
index c0a178ebd51a..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
@@ -1438,7 +1438,6 @@ components:
       example:
         petId: 6
         quantity: 1
-        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1466,18 +1465,6 @@ components:
         complete:
           default: false
           type: boolean
-        paymentMethod:
-          default: 1
-          description: Various payment methods
-          enum:
-          - 1
-          - 2
-          example: 1
-          format: int32
-          type: number
-          x-enum-description:
-          - Paypal
-          - Creditcard
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
index b25552d366d9..27af32855c5c 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
@@ -13,7 +13,6 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
-|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
 
 
 
@@ -27,12 +26,3 @@
 
 
 
-## Enum: PaymentMethodEnum
-
-| Name | Value |
-|---- | -----|
-| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
-| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
-
-
-
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index 71c7f6b2cd39..b0d7d12d6f62 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -292,31 +251,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -332,13 +266,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -351,7 +284,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index 71c7f6b2cd39..b0d7d12d6f62 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,8 +33,7 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE,
-  Order.JSON_PROPERTY_PAYMENT_METHOD
+  Order.JSON_PROPERTY_COMPLETE
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -100,45 +98,6 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
-  /**
-   * Various payment methods
-   */
-  public enum PaymentMethodEnum {
-    NUMBER_1(new BigDecimal("1")),
-    
-    NUMBER_2(new BigDecimal("2"));
-
-    private BigDecimal value;
-
-    PaymentMethodEnum(BigDecimal value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public BigDecimal getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static PaymentMethodEnum fromValue(BigDecimal value) {
-      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
-  @javax.annotation.Nullable
-  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
-
   public Order() {
   }
 
@@ -292,31 +251,6 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
-  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Various payment methods
-   * @return paymentMethod
-   */
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public PaymentMethodEnum getPaymentMethod() {
-    return paymentMethod;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
 
   @Override
   public boolean equals(Object o) {
@@ -332,13 +266,12 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete) &&
-        Objects.equals(this.paymentMethod, order.paymentMethod);
+        Objects.equals(this.complete, order.complete);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
   }
 
   @Override
@@ -351,7 +284,6 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 2ae10f3f0f54..ce27417ec1da 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -60,7 +60,6 @@ Model/NullableClass.php
 Model/NumberOnly.php
 Model/ObjectWithDeprecatedFields.php
 Model/Order.php
-Model/OrderPaymentMethod.php
 Model/OrderStatus.php
 Model/OuterComposite.php
 Model/OuterEnum.php
diff --git a/samples/server/petstore/php-laravel/Model/Order.php b/samples/server/petstore/php-laravel/Model/Order.php
index b4e58a774d1e..4a9f2eb3d572 100644
--- a/samples/server/petstore/php-laravel/Model/Order.php
+++ b/samples/server/petstore/php-laravel/Model/Order.php
@@ -51,9 +51,6 @@ class Order
     *
     * 
     * @param bool $complete
-    *
-    * 
-    * @param \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod
     */
 
     public function __construct(
@@ -63,7 +60,6 @@ public function __construct(
         public \DateTime $shipDate,
         public \OpenAPI\Server\Model\OrderStatus $status,
         public bool $complete = false,
-        public \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod,
     ) {}
 }
 

From eae67257db3ca0b648ad10e280e6b96d8ceb50cd Mon Sep 17 00:00:00 2001
From: Martin <2026226+martin-mfg@users.noreply.github.com>
Date: Wed, 29 Jan 2025 11:06:50 +0100
Subject: [PATCH 16/22] update faulty sample tests

---
 .../test/java/org/openapitools/client/api/FakeApiTest.java    | 4 +++-
 .../test/java/org/openapitools/client/api/FakeApiTest.java    | 4 +++-
 .../test/java/org/openapitools/client/api/FakeApiTest.java    | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 232d5f66bdf0..79ecbddbfaac 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -258,7 +258,9 @@ public void testEnumParametersTest()  {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 232d5f66bdf0..79ecbddbfaac 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -258,7 +258,9 @@ public void testEnumParametersTest()  {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }
diff --git a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
index 232d5f66bdf0..79ecbddbfaac 100644
--- a/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
+++ b/samples/client/petstore/java/restclient/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -258,7 +258,9 @@ public void testEnumParametersTest()  {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+        Integer enumFormInteger = null;
+        BigDecimal enumFormDouble = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
 
         // TODO: test validations
     }

From 83e70091e9f3cc7453bfbd491bb5b7ba5760d018 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Mon, 2 Jun 2025 13:22:31 +0200
Subject: [PATCH 17/22] issue-20188: regenerate samples after rebase

---
 .../petstore/java/feign-hc5/api/openapi.yaml  | 17 ++++
 .../org/openapitools/client/api/FakeApi.java  | 16 +++-
 .../openapitools/client/model/EnumTest.java   |  8 +-
 .../org/openapitools/client/model/Order.java  | 89 ++++++++++++++++++-
 .../api/openapi.yaml                          | 17 ++++
 .../docs/FakeApi.md                           |  8 +-
 .../org/openapitools/client/api/FakeApi.java  | 60 ++++++++++---
 .../openapitools/client/model/EnumTest.java   |  8 +-
 .../vertx-supportVertxFuture/api/openapi.yaml | 17 ++++
 .../vertx-supportVertxFuture/docs/FakeApi.md  |  8 +-
 .../org/openapitools/client/api/FakeApi.java  | 12 +--
 .../openapitools/client/api/FakeApiImpl.java  | 12 ++-
 .../client/api/rxjava/FakeApi.java            | 24 +++--
 .../openapitools/client/model/EnumTest.java   |  8 +-
 .../org/openapitools/client/api/FakeApi.java  | 60 ++++++++++---
 15 files changed, 298 insertions(+), 66 deletions(-)

diff --git a/samples/client/petstore/java/feign-hc5/api/openapi.yaml b/samples/client/petstore/java/feign-hc5/api/openapi.yaml
index 7d3a48a0496b..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/feign-hc5/api/openapi.yaml
+++ b/samples/client/petstore/java/feign-hc5/api/openapi.yaml
@@ -2217,6 +2217,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
index 17293273af5d..404e7cd6489c 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -570,6 +570,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    */
   @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
   @Headers({
@@ -579,7 +581,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
     
     "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
 
   /**
    * To test enum parameters
@@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumQueryModelArray  (optional)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    */
   @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
   @Headers({
@@ -603,7 +607,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
     
     "enum_header_string: {enumHeaderString}"
   })
-  ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
+  ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
 
 
   /**
@@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
    * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
    * @param enumFormStringArray Form parameter enum test (string array) (optional)
    * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+   * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
    * @param queryParams Map of query parameters as name-value pairs
    *   <p>The following elements may be specified in the query map:</p>
    *   <ul>
@@ -636,7 +642,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
       "enum_header_string: {enumHeaderString}"
   })
-  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+  void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
 
   /**
   * To test enum parameters
@@ -647,6 +653,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
               * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
               * @param enumFormStringArray Form parameter enum test (string array) (optional)
               * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+              * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+              * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
       * @param queryParams Map of query parameters as name-value pairs
       *   <p>The following elements may be specified in the query map:</p>
       *   <ul>
@@ -665,7 +673,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
       
           "enum_header_string: {enumHeaderString}"
       })
-   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
+   ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
 
 
    /**
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java
index 309485f05380..a5ac61e6eba4 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index 9d9311ed40ed..1dde249fe9bb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 
@@ -135,6 +136,63 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  @JsonAdapter(PaymentMethodEnum.Adapter.class)
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+
+    public static class Adapter extends TypeAdapter<PaymentMethodEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final PaymentMethodEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public PaymentMethodEnum read(final JsonReader jsonReader) throws IOException {
+        String value =  jsonReader.nextString();
+        return PaymentMethodEnum.fromValue(new BigDecimal(value));
+      }
+    }
+
+    public static void validateJsonElement(JsonElement jsonElement) throws IOException {
+      String value = jsonElement.getAsString();
+      PaymentMethodEnum.fromValue(new BigDecimal(value));
+    }
+  }
+
+  public static final String SERIALIZED_NAME_PAYMENT_METHOD = "paymentMethod";
+  @SerializedName(SERIALIZED_NAME_PAYMENT_METHOD)
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
   public Order() {
   }
 
@@ -251,6 +309,25 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
   /**
    * A container for additional, undeclared properties.
    * This is a holder for any undeclared properties as specified with
@@ -311,13 +388,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete)&&
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod)&&
         Objects.equals(this.additionalProperties, order.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete, additionalProperties);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, additionalProperties);
   }
 
   @Override
@@ -330,6 +408,7 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
     sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
@@ -352,7 +431,7 @@ private String toIndentedString(Object o) {
 
   static {
     // a set of all properties/fields (JSON key names)
-    openapiFields = new HashSet<String>(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete"));
+    openapiFields = new HashSet<String>(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete", "paymentMethod"));
 
     // a set of required properties/fields (JSON key names)
     openapiRequiredFields = new HashSet<String>(0);
@@ -378,6 +457,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
       if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) {
         StatusEnum.validateJsonElement(jsonObj.get("status"));
       }
+      // validate the optional field `paymentMethod`
+      if (jsonObj.get("paymentMethod") != null && !jsonObj.get("paymentMethod").isJsonNull()) {
+        PaymentMethodEnum.validateJsonElement(jsonObj.get("paymentMethod"));
+      }
   }
 
   public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
index 7d3a48a0496b..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
@@ -2217,6 +2217,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md
index 37a949ea0508..55324d1d878f 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java
index 8f41ca5c43ea..a5864ee10767 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1548,10 +1548,12 @@ public static class TestEnumParametersRequest {
         private @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray;
         private @jakarta.annotation.Nullable List<String> enumFormStringArray;
         private @jakarta.annotation.Nullable String enumFormString;
+        private @jakarta.annotation.Nullable Integer enumFormInteger;
+        private @jakarta.annotation.Nullable BigDecimal enumFormDouble;
 
         public TestEnumParametersRequest() {}
 
-        public TestEnumParametersRequest(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) {
+        public TestEnumParametersRequest(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) {
             this.enumHeaderStringArray = enumHeaderStringArray;
             this.enumHeaderString = enumHeaderString;
             this.enumQueryStringArray = enumQueryStringArray;
@@ -1561,6 +1563,8 @@ public TestEnumParametersRequest(@jakarta.annotation.Nullable List<String> enumH
             this.enumQueryModelArray = enumQueryModelArray;
             this.enumFormStringArray = enumFormStringArray;
             this.enumFormString = enumFormString;
+            this.enumFormInteger = enumFormInteger;
+            this.enumFormDouble = enumFormDouble;
         }
 
         public @jakarta.annotation.Nullable List<String> enumHeaderStringArray() {
@@ -1635,6 +1639,22 @@ public TestEnumParametersRequest enumFormString(@jakarta.annotation.Nullable Str
             return this;
         }
 
+        public @jakarta.annotation.Nullable Integer enumFormInteger() {
+            return this.enumFormInteger;
+        }
+        public TestEnumParametersRequest enumFormInteger(@jakarta.annotation.Nullable Integer enumFormInteger) {
+            this.enumFormInteger = enumFormInteger;
+            return this;
+        }
+
+        public @jakarta.annotation.Nullable BigDecimal enumFormDouble() {
+            return this.enumFormDouble;
+        }
+        public TestEnumParametersRequest enumFormDouble(@jakarta.annotation.Nullable BigDecimal enumFormDouble) {
+            this.enumFormDouble = enumFormDouble;
+            return this;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) {
@@ -1652,12 +1672,14 @@ public boolean equals(Object o) {
                 Objects.equals(this.enumQueryDouble, request.enumQueryDouble()) &&
                 Objects.equals(this.enumQueryModelArray, request.enumQueryModelArray()) &&
                 Objects.equals(this.enumFormStringArray, request.enumFormStringArray()) &&
-                Objects.equals(this.enumFormString, request.enumFormString());
+                Objects.equals(this.enumFormString, request.enumFormString()) &&
+                Objects.equals(this.enumFormInteger, request.enumFormInteger()) &&
+                Objects.equals(this.enumFormDouble, request.enumFormDouble());
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         }
     }
 
@@ -1670,7 +1692,7 @@ public int hashCode() {
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public void testEnumParameters(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
   /**
@@ -1682,7 +1704,7 @@ public void testEnumParameters(TestEnumParametersRequest requestParameters) thro
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public ResponseEntity<Void> testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
   /**
@@ -1695,7 +1717,7 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(TestEnumParametersReq
   * @throws RestClientResponseException if an error occurs while attempting to invoke the API
     */
     public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws RestClientResponseException {
-      return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+      return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
     /**
@@ -1712,9 +1734,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<>();
@@ -1739,6 +1763,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1767,11 +1795,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType);
+        testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType);
     }
 
     /**
@@ -1788,11 +1818,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List<String> enumHea
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
+    public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1809,11 +1841,13 @@ public ResponseEntity<Void> testEnumParametersWithHttpInfo(@jakarta.annotation.N
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List<String> enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List<String> enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List<EnumClass> enumQueryModelArray, @jakarta.annotation.Nullable List<String> enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     public static class TestGroupParametersRequest {
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java
index 0eb8cdd88ed5..f8139e3d3a13 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
index 7d3a48a0496b..7f2dbb3ff954 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
@@ -2217,6 +2217,23 @@ components:
           - -efg
           - (xyz)
           type: string
+        enum_form_integer:
+          default: 1
+          description: Form parameter enum test (integer)
+          enum:
+          - 1
+          - -1
+          - 0
+          type: integer
+        enum_form_double:
+          default: 1.1
+          description: Form parameter enum test (double)
+          enum:
+          - 1.1
+          - -1.1
+          - 0.1
+          - 0.0
+          type: number
       type: object
     testEndpointParameters_request:
       properties:
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md b/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md
index 22cff7dd2e8a..8d12ae9b0f80 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md
@@ -976,7 +976,7 @@ null (empty response body)
 
 ## testEnumParameters
 
-> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
 
 To test enum parameters
 
@@ -1007,8 +1007,10 @@ public class Example {
         List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> | 
         List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
         String enumFormString = "_abc"; // String | Form parameter enum test (string)
+        Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
+        BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
         try {
-            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEnumParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
 | **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)|  | [optional] |
 | **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
 | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
+| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
+| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java
index b5f109d785f9..14ff9b5f74ed 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -250,19 +250,19 @@ default Future<Void> testEndpointParameters(@javax.annotation.Nonnull BigDecimal
         return promise.future();
     }
 
-    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, Handler<AsyncResult<Void>> handler);
+    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Handler<AsyncResult<Void>> handler);
 
-    default Future<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString){
+    default Future<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble){
         Promise<Void> promise = Promise.promise();
-        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, promise);
+        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, promise);
         return promise.future();
     }
 
-    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
+    void testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
 
-    default Future<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo){
+    default Future<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo){
         Promise<Void> promise = Promise.promise();
-        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, promise);
+        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, promise);
         return promise.future();
     }
 
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index c8b96dda8296..69904375aa85 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -772,10 +772,12 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         * @param enumQueryModelArray  (optional)
         * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
         * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+        * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+        * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> resultHandler) {
-        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, null, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, Handler<AsyncResult<Void>> resultHandler) {
+        testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null, resultHandler);
     }
 
     /**
@@ -790,10 +792,12 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
         Object localVarBody = null;
         
         // create path and map variables
@@ -822,6 +826,8 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
         Map<String, Object> localVarFormParams = new HashMap<>();
         if (enumFormStringArray != null) localVarFormParams.put("enum_form_string_array", enumFormStringArray);
 if (enumFormString != null) localVarFormParams.put("enum_form_string", enumFormString);
+if (enumFormInteger != null) localVarFormParams.put("enum_form_integer", enumFormInteger);
+if (enumFormDouble != null) localVarFormParams.put("enum_form_double", enumFormDouble);
 
         String[] localVarAccepts = {  };
         String[] localVarContentTypes = { "application/x-www-form-urlencoded" };
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
index 7d56463f60e2..6a0ff7794f39 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
@@ -734,10 +734,12 @@ public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double,
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, resultHandler);
     }
 
     /**
@@ -752,11 +754,13 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
     */
-    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, resultHandler);
+    public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, resultHandler);
     }
 
     /**
@@ -771,11 +775,13 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString) {
+    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, fut)
+            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, fut)
         ));
     }
 
@@ -791,12 +797,14 @@ public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, Str
     * @param enumQueryModelArray  (optional)
     * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
     * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+    * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
+    * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo) {
+    public Single<Void> rxTestEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, fut)
+            delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, fut)
         ));
     }
     /**
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java
index fbd92e259a57..44538cb58284 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(Integer.valueOf(1)),
+    NUMBER_1(1),
     
-    NUMBER_MINUS_1(Integer.valueOf(-1));
+    NUMBER_MINUS_1(-1);
 
     private Integer value;
 
@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
    * Gets or Sets enumNumber
    */
   public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(Double.valueOf(1.1)),
+    NUMBER_1_DOT_1(1.1),
     
-    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
+    NUMBER_MINUS_1_DOT_2(-1.2);
 
     private Double value;
 
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
index ae39807e49c5..c78e84a814c8 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1564,10 +1564,12 @@ public class TestEnumParametersRequest {
         private @javax.annotation.Nullable List<EnumClass> enumQueryModelArray;
         private @javax.annotation.Nullable List<String> enumFormStringArray;
         private @javax.annotation.Nullable String enumFormString;
+        private @javax.annotation.Nullable Integer enumFormInteger;
+        private @javax.annotation.Nullable BigDecimal enumFormDouble;
 
         public TestEnumParametersRequest() {}
 
-        public TestEnumParametersRequest(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) {
+        public TestEnumParametersRequest(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) {
             this.enumHeaderStringArray = enumHeaderStringArray;
             this.enumHeaderString = enumHeaderString;
             this.enumQueryStringArray = enumQueryStringArray;
@@ -1577,6 +1579,8 @@ public TestEnumParametersRequest(@javax.annotation.Nullable List<String> enumHea
             this.enumQueryModelArray = enumQueryModelArray;
             this.enumFormStringArray = enumFormStringArray;
             this.enumFormString = enumFormString;
+            this.enumFormInteger = enumFormInteger;
+            this.enumFormDouble = enumFormDouble;
         }
 
         public @javax.annotation.Nullable List<String> enumHeaderStringArray() {
@@ -1651,6 +1655,22 @@ public TestEnumParametersRequest enumFormString(@javax.annotation.Nullable Strin
             return this;
         }
 
+        public @javax.annotation.Nullable Integer enumFormInteger() {
+            return this.enumFormInteger;
+        }
+        public TestEnumParametersRequest enumFormInteger(@javax.annotation.Nullable Integer enumFormInteger) {
+            this.enumFormInteger = enumFormInteger;
+            return this;
+        }
+
+        public @javax.annotation.Nullable BigDecimal enumFormDouble() {
+            return this.enumFormDouble;
+        }
+        public TestEnumParametersRequest enumFormDouble(@javax.annotation.Nullable BigDecimal enumFormDouble) {
+            this.enumFormDouble = enumFormDouble;
+            return this;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) {
@@ -1668,12 +1688,14 @@ public boolean equals(Object o) {
                 Objects.equals(this.enumQueryDouble, request.enumQueryDouble()) &&
                 Objects.equals(this.enumQueryModelArray, request.enumQueryModelArray()) &&
                 Objects.equals(this.enumFormStringArray, request.enumFormStringArray()) &&
-                Objects.equals(this.enumFormString, request.enumFormString());
+                Objects.equals(this.enumFormString, request.enumFormString()) &&
+                Objects.equals(this.enumFormInteger, request.enumFormInteger()) &&
+                Objects.equals(this.enumFormDouble, request.enumFormDouble());
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+            return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
         }
     }
 
@@ -1686,7 +1708,7 @@ public int hashCode() {
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
     public Mono<Void> testEnumParameters(TestEnumParametersRequest requestParameters) throws WebClientResponseException {
-        return this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+        return this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
     /**
@@ -1698,7 +1720,7 @@ public Mono<Void> testEnumParameters(TestEnumParametersRequest requestParameters
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
     public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws WebClientResponseException {
-        return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+        return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
     /**
@@ -1711,7 +1733,7 @@ public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(TestEnumParamet
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
     public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws WebClientResponseException {
-       return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString());
+       return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble());
     }
 
           
@@ -1729,9 +1751,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         Object postBody = null;
         // create path and map variables
         final Map<String, Object> pathParams = new HashMap<String, Object>();
@@ -1756,6 +1780,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
             formParams.addAll("enum_form_string_array", enumFormStringArray);
         if (enumFormString != null)
             formParams.add("enum_form_string", enumFormString);
+        if (enumFormInteger != null)
+            formParams.add("enum_form_integer", enumFormInteger);
+        if (enumFormDouble != null)
+            formParams.add("enum_form_double", enumFormDouble);
 
         final String[] localVarAccepts = { };
         final List<MediaType> localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
@@ -1784,11 +1812,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1805,11 +1835,13 @@ public Mono<Void> testEnumParameters(@javax.annotation.Nullable List<String> enu
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType);
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType);
     }
 
     /**
@@ -1826,11 +1858,13 @@ public Mono<ResponseEntity<Void>> testEnumParametersWithHttpInfo(@javax.annotati
      * @param enumQueryModelArray The enumQueryModelArray parameter
      * @param enumFormStringArray Form parameter enum test (string array)
      * @param enumFormString Form parameter enum test (string)
+     * @param enumFormInteger Form parameter enum test (integer)
+     * @param enumFormDouble Form parameter enum test (double)
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException {
-        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
+    public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List<String> enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List<String> enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @javax.annotation.Nullable List<String> enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException {
+        return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
     }
 
     public class TestGroupParametersRequest {

From 2567febd74c9192e0480316b99056c5b8d266eef Mon Sep 17 00:00:00 2001
From: timon-sbr <timon.link@sbroker.de>
Date: Mon, 2 Jun 2025 15:37:54 +0200
Subject: [PATCH 18/22] Update
 modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jorge Rodríguez Martín <jorgerod84@gmail.com>
---
 .../src/main/resources/Java/modelInnerEnum.mustache             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
index c8cc050cb155..cc5fa874aeb0 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
@@ -23,7 +23,7 @@
     {{#withXml}}
     @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
     {{/withXml}}
-    {{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
+    {{{name}}}({{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}

From 47cc413278de1b118b058bc6fd737a0fc4b2d63e Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Mon, 2 Jun 2025 17:29:09 +0200
Subject: [PATCH 19/22] issue-20188: regenerate samples

---
 .../libraries/microprofile/enumClass.mustache |   2 +-
 .../okhttp-gson/modelInnerEnum.mustache       |   2 +-
 ...ith-fake-endpoints-models-for-testing.yaml |  19 ++
 .../java-helidon-client/v3/mp/docs/Order.md   |  20 ++
 .../org/openapitools/client/model/Order.java  |  95 ++++++++++
 .../java-helidon-client/v3/se/docs/Order.md   |  20 ++
 .../org/openapitools/client/model/Order.java  |  95 ++++++++++
 .../java-helidon-client/v4/mp/docs/Order.md   |  20 ++
 .../org/openapitools/client/model/Order.java  |  95 ++++++++++
 .../java-helidon-client/v4/se/docs/Order.md   |  20 ++
 .../org/openapitools/client/model/Order.java  |  95 ++++++++++
 .../java/apache-httpclient/api/openapi.yaml   |  21 +++
 .../java/apache-httpclient/docs/Order.md      |  20 ++
 .../org/openapitools/client/model/Order.java  | 161 +++++++++++++++-
 .../petstore/java/feign-hc5/api/openapi.yaml  |  21 +++
 .../org/openapitools/client/model/Order.java  | 143 +++++++++++++-
 .../petstore/java/feign/api/openapi.yaml      |  21 +++
 .../org/openapitools/client/model/Order.java  | 143 +++++++++++++-
 .../docs/Order.md                             |  20 ++
 .../openapitools/client/model/EnumArrays.java |   4 +-
 .../openapitools/client/model/EnumTest.java   |   8 +-
 .../openapitools/client/model/MapTest.java    |   2 +-
 .../org/openapitools/client/model/Order.java  | 135 +++++++++++++-
 .../client/model/ParentWithNullable.java      |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../docs/Order.md                             |  20 ++
 .../openapitools/client/model/EnumArrays.java |   4 +-
 .../openapitools/client/model/EnumTest.java   |   8 +-
 .../openapitools/client/model/MapTest.java    |   2 +-
 .../org/openapitools/client/model/Order.java  | 147 ++++++++++++++-
 .../client/model/ParentWithNullable.java      |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../microprofile-rest-client/docs/Order.md    |  20 ++
 .../openapitools/client/model/EnumArrays.java |   4 +-
 .../openapitools/client/model/EnumTest.java   |   8 +-
 .../openapitools/client/model/MapTest.java    |   2 +-
 .../org/openapitools/client/model/Order.java  | 147 ++++++++++++++-
 .../client/model/ParentWithNullable.java      |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../java/restclient-swagger2/api/openapi.yaml |  21 +++
 .../java/restclient-swagger2/docs/Order.md    |  20 ++
 .../org/openapitools/client/model/Order.java  | 143 +++++++++++++-
 .../api/openapi.yaml                          |  21 +++
 .../docs/Order.md                             |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../api/openapi.yaml                          |  21 +++
 .../docs/Order.md                             |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../petstore/java/restclient/api/openapi.yaml |  21 +++
 .../petstore/java/restclient/docs/Order.md    |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../petstore/java/resteasy/api/openapi.yaml   |  21 +++
 .../petstore/java/resteasy/docs/Order.md      |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../resttemplate-withXml/api/openapi.yaml     |  21 +++
 .../java/resttemplate-withXml/docs/Order.md   |  20 ++
 .../org/openapitools/client/model/Order.java  | 155 +++++++++++++++-
 .../java/resttemplate/api/openapi.yaml        |  21 +++
 .../petstore/java/resttemplate/docs/Order.md  |  20 ++
 .../org/openapitools/client/model/Order.java  | 157 +++++++++++++++-
 .../vertx-supportVertxFuture/api/openapi.yaml |  21 +++
 .../vertx-supportVertxFuture/docs/Order.md    |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../petstore/java/vertx/api/openapi.yaml      |  21 +++
 .../client/petstore/java/vertx/docs/Order.md  |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../java/webclient-jakarta/api/openapi.yaml   |  21 +++
 .../java/webclient-jakarta/docs/Order.md      |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../java/webclient-swagger2/api/openapi.yaml  |  21 +++
 .../java/webclient-swagger2/docs/Order.md     |  20 ++
 .../org/openapitools/client/model/Order.java  | 143 +++++++++++++-
 .../api/openapi.yaml                          |  21 +++
 .../docs/Order.md                             |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../petstore/java/webclient/api/openapi.yaml  |  21 +++
 .../petstore/java/webclient/docs/Order.md     |  20 ++
 .../org/openapitools/client/model/Order.java  | 141 +++++++++++++-
 .../petstore/ruby-autoload/docs/Order.md      |   6 +-
 .../lib/petstore/models/order.rb              |  54 +++++-
 .../petstore/ruby-faraday/docs/Order.md       |   6 +-
 .../ruby-faraday/lib/petstore/models/order.rb |  54 +++++-
 .../builds/default-v3.0/models/Order.ts       |  34 ++++
 .../doc/Order.md                              |   2 +
 .../lib/src/model/order.dart                  |  82 ++++++++-
 .../petstore_client_lib_fake/doc/Order.md     |   2 +
 .../lib/src/model/order.dart                  |  84 ++++++++-
 .../petstore_client_lib_fake/doc/Order.md     |   2 +
 .../lib/model/order.dart                      | 174 +++++++++++++++++-
 samples/schema/petstore/mysql/Model/Order.sql |   6 +-
 .../schema/petstore/mysql/mysql_schema.sql    |   4 +-
 .../cpp-restbed/generated/3_0/model/Order.cpp |  41 +++++
 .../cpp-restbed/generated/3_0/model/Order.h   |  14 ++
 .../org/openapitools/server/model/Order.java  | 147 +++++++++++++++
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  | 111 ++++++++++-
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  | 147 +++++++++++++++
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  | 111 ++++++++++-
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  | 111 ++++++++++-
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  | 111 ++++++++++-
 .../src/main/resources/META-INF/openapi.yml   |  21 +++
 .../org/openapitools/server/model/Order.java  |   2 +-
 .../org/openapitools/server/model/Pet.java    |   2 +-
 .../mockserver/api/StoreApiMockServer.java    |  10 +-
 .../java/org/openapitools/model/Order.java    | 131 ++++++++++++-
 .../java/org/openapitools/model/Order.java    | 157 +++++++++++++++-
 .../src/main/resources/META-INF/openapi.yaml  |  21 +++
 .../java/org/openapitools/model/Order.java    | 131 ++++++++++++-
 .../php-laravel/.openapi-generator/FILES      |   2 +
 .../petstore/php-laravel/Model/Order.php      |   8 +
 120 files changed, 5729 insertions(+), 132 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
index cf50d662d80d..b1347308b52f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
@@ -15,7 +15,7 @@
     {{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{^withXml}}
-    {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}){{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+        {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{/allowableValues}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
index 0fb357f79a1e..19c68ff602e7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache
@@ -17,7 +17,7 @@
     {{#withXml}}
     @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
     {{/withXml}}
-    {{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
+    {{{name}}}({{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 45dfa82225bb..e4d034586ab2 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1434,6 +1434,25 @@ components:
         complete:
           type: boolean
           default: false
+        paymentMethod:
+          type: number
+          format: int32
+          description: "Various payment methods"
+          default: 1
+          example: 1
+          x-enum-description:
+            - Paypal
+            - Creditcard
+          enum:
+            - 1
+            - 2
+        OrderStatus:
+          type: string
+          description: Order status
+          additionalProperties: false
+          enum:
+            - PENDING
+            - PROCESSING
       xml:
         name: Order
     Category:
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..f1e720f0476c 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,58 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -180,6 +233,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +288,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..f1e720f0476c 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,58 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -180,6 +233,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +288,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..f1e720f0476c 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,58 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -180,6 +233,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +288,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
+++ b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
index 84ce8e3fa1fb..f1e720f0476c 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
@@ -17,6 +17,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 
 
@@ -60,6 +61,58 @@ public String toString() {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -180,6 +233,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -195,6 +288,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
+++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/apache-httpclient/docs/Order.md b/samples/client/petstore/java/apache-httpclient/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/Order.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
index e14bfaf7f443..e8b08b6bfda5 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -36,7 +37,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -101,6 +104,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -254,6 +335,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -268,12 +399,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -286,6 +419,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -393,6 +528,26 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
+    // add `paymentMethod` to the URL query string
+    if (getPaymentMethod() != null) {
+      try {
+        joiner.add(String.format("%spaymentMethod%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPaymentMethod()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
+    // add `OrderStatus` to the URL query string
+    if (getOrderStatus() != null) {
+      try {
+        joiner.add(String.format("%sOrderStatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getOrderStatus()), "UTF-8").replaceAll("\\+", "%20")));
+      } catch (UnsupportedEncodingException e) {
+        // Should never happen, UTF-8 is always supported
+        throw new RuntimeException(e);
+      }
+    }
+
     return joiner.toString();
   }
 
diff --git a/samples/client/petstore/java/feign-hc5/api/openapi.yaml b/samples/client/petstore/java/feign-hc5/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/feign-hc5/api/openapi.yaml
+++ b/samples/client/petstore/java/feign-hc5/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java
index f7452464bfb2..9debb0bab521 100644
--- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -257,6 +338,58 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
   }
 
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -271,12 +404,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -289,6 +424,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/feign/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index f7452464bfb2..9debb0bab521 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -257,6 +338,58 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
   }
 
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -271,12 +404,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -289,6 +424,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
index 4993c503e5f3..d565898583db 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
index 4c3728a3d099..656a162aa4de 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -36,7 +36,7 @@ public class EnumArrays  {
   
   public enum JustSymbolEnum {
 
-    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -72,7 +72,7 @@ public static JustSymbolEnum fromValue(String value) {
 
   public enum ArrayEnumEnum {
 
-    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index 0d5e5b65d533..d5e487b03f1a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -44,7 +44,7 @@ public class EnumTest  {
   
   public enum EnumStringEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -80,7 +80,7 @@ public static EnumStringEnum fromValue(String value) {
 
   public enum EnumStringRequiredEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -116,7 +116,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
 
   public enum EnumIntegerEnum {
 
-    NUMBER_1(1), NUMBER_MINUS_1(-1);
+        NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -152,7 +152,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
 
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
index 5adaa6bb314f..2d5f73b2788e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -41,7 +41,7 @@ public class MapTest  {
 
   public enum InnerEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
index 271bd025d550..e64574e3cf96 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -31,7 +32,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 
 public class Order  {
@@ -54,7 +57,7 @@ public class Order  {
 
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -95,6 +98,84 @@ public static StatusEnum fromValue(String value) {
   
   private Boolean complete = false;
 
+  public enum PaymentMethodEnum {
+
+        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    @JsonValue
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+        public static PaymentMethodEnum fromValue(BigDecimal value) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (b.value.equals(value)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + value + "'");
+        }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+ /**
+  * Various payment methods
+  */
+  
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  public enum OrderStatusEnum {
+
+        PENDING("PENDING"), PROCESSING("PROCESSING");
+
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    @JsonValue
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    @JsonCreator
+        public static OrderStatusEnum fromValue(Object value) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (b.value.equals(value)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + value + "'");
+        }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+ /**
+  * Order status
+  */
+  
+  private OrderStatusEnum orderStatus;
+
   /**
    * Get id
    * @return id
@@ -239,6 +320,54 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   **/
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+   * Set orderStatus
+   */
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     return EqualsBuilder.reflectionEquals(this, o, false, null, true);
@@ -263,6 +392,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 657f266e6db5..dc5fbc4723f2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -45,7 +45,7 @@ public class ParentWithNullable  {
   
   public enum TypeEnum {
 
-    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
index f53d512ee9c2..314ae1f21bee 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
@@ -65,7 +65,7 @@ public class Pet  {
 
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
index 06c78288e181..09d078772c50 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
@@ -52,7 +52,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
index 28dd90e2ebd4..0a5e28e9dc94 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
@@ -59,7 +59,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
index 4993c503e5f3..d565898583db 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
index 2fffb41be6e0..230d8f22e3c4 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -39,7 +39,7 @@ public class EnumArrays  {
   @JsonbTypeDeserializer(JustSymbolEnum.Deserializer.class)
   public enum JustSymbolEnum {
 
-    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -84,7 +84,7 @@ public void serialize(JustSymbolEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(ArrayEnumEnum.Deserializer.class)
   public enum ArrayEnumEnum {
 
-    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
index 9ef4fff63284..37869411929f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -40,7 +40,7 @@ public class EnumTest  {
   @JsonbTypeDeserializer(EnumStringEnum.Deserializer.class)
   public enum EnumStringEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -85,7 +85,7 @@ public void serialize(EnumStringEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(EnumStringRequiredEnum.Deserializer.class)
   public enum EnumStringRequiredEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -130,7 +130,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-    NUMBER_1(1), NUMBER_MINUS_1(-1);
+        NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -175,7 +175,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
index a72e26d96327..b565fa373b58 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
@@ -41,7 +41,7 @@ public class MapTest  {
   @JsonbTypeDeserializer(InnerEnum.Deserializer.class)
   public enum InnerEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
index 5a3f97ede37b..97f6f8626df2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
@@ -14,6 +14,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import jakarta.json.bind.annotation.JsonbTypeDeserializer;
@@ -49,7 +50,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -96,6 +97,102 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
+  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
+  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
+  public enum PaymentMethodEnum {
+
+        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
+        @Override
+        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
+        @Override
+        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Various payment methods
+  */
+  @JsonbProperty("paymentMethod")
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  @JsonbTypeSerializer(OrderStatusEnum.Serializer.class)
+  @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class)
+  public enum OrderStatusEnum {
+
+        PENDING("PENDING"), PROCESSING("PROCESSING");
+
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<OrderStatusEnum> {
+        @Override
+        public OrderStatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<OrderStatusEnum> {
+        @Override
+        public void serialize(OrderStatusEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Order status
+  */
+  @JsonbProperty("OrderStatus")
+  private OrderStatusEnum orderStatus;
+
   /**
    * Get id
    * @return id
@@ -216,6 +313,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+   * Set orderStatus
+   */
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -230,12 +367,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   /**
@@ -252,6 +391,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 5908510fdb9c..d91e3d1551c1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -38,7 +38,7 @@ public class ParentWithNullable  {
   @JsonbTypeDeserializer(TypeEnum.Deserializer.class)
   public enum TypeEnum {
 
-    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
index 89186a67e942..6a7f1c33a306 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
@@ -58,7 +58,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
index 2ca6b66700ff..fc178fc76a17 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
@@ -49,7 +49,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
index fc10762ad1d2..f8a23df6fef6 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
@@ -56,7 +56,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index 06c78288e181..09d078772c50 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -52,7 +52,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
index 28dd90e2ebd4..0a5e28e9dc94 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
@@ -59,7 +59,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
index 4993c503e5f3..d565898583db 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **Date** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index 29267b36bf13..b7c60ed5adbf 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -36,7 +36,7 @@ public class EnumArrays  {
   @JsonbTypeDeserializer(JustSymbolEnum.Deserializer.class)
   public enum JustSymbolEnum {
 
-    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -81,7 +81,7 @@ public void serialize(JustSymbolEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(ArrayEnumEnum.Deserializer.class)
   public enum ArrayEnumEnum {
 
-    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 7fe3260cc677..75f4b7cca0af 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -37,7 +37,7 @@ public class EnumTest  {
   @JsonbTypeDeserializer(EnumStringEnum.Deserializer.class)
   public enum EnumStringEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -82,7 +82,7 @@ public void serialize(EnumStringEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(EnumStringRequiredEnum.Deserializer.class)
   public enum EnumStringRequiredEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -127,7 +127,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-    NUMBER_1(1), NUMBER_MINUS_1(-1);
+        NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -172,7 +172,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
index e6977a0567d5..ae86af68b3e0 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -38,7 +38,7 @@ public class MapTest  {
   @JsonbTypeDeserializer(InnerEnum.Deserializer.class)
   public enum InnerEnum {
 
-    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index e8f48097237f..d7e39bc19396 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -14,6 +14,7 @@
 
 import java.util.Objects;
 import java.util.Arrays;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.lang.reflect.Type;
 import javax.json.bind.annotation.JsonbTypeDeserializer;
@@ -46,7 +47,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -93,6 +94,102 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbProperty("complete")
   private Boolean complete = false;
 
+  @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class)
+  @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
+  public enum PaymentMethodEnum {
+
+        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<PaymentMethodEnum> {
+        @Override
+        public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<PaymentMethodEnum> {
+        @Override
+        public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Various payment methods
+  */
+  @JsonbProperty("paymentMethod")
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  @JsonbTypeSerializer(OrderStatusEnum.Serializer.class)
+  @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class)
+  public enum OrderStatusEnum {
+
+        PENDING("PENDING"), PROCESSING("PROCESSING");
+
+
+    Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    public static final class Deserializer implements JsonbDeserializer<OrderStatusEnum> {
+        @Override
+        public OrderStatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(parser.getString())) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'");
+        }
+    }
+
+    public static final class Serializer implements JsonbSerializer<OrderStatusEnum> {
+        @Override
+        public void serialize(OrderStatusEnum obj, JsonGenerator generator, SerializationContext ctx) {
+            generator.write(obj.value);
+        }
+    }
+  }
+
+ /**
+  * Order status
+  */
+  @JsonbProperty("OrderStatus")
+  private OrderStatusEnum orderStatus;
+
   /**
    * Get id
    * @return id
@@ -213,6 +310,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+   * Set paymentMethod
+   */
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+   * Set orderStatus
+   */
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -227,12 +364,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   /**
@@ -249,6 +388,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index f26bca67bcce..164526d5a6ab 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -33,7 +33,7 @@ public class ParentWithNullable  {
   @JsonbTypeDeserializer(TypeEnum.Deserializer.class)
   public enum TypeEnum {
 
-    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
index 826495b93453..9e0f59b20628 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -55,7 +55,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/Order.md b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index ec2f45d07edf..cb9bc0ef383f 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,7 +35,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -99,6 +102,84 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @jakarta.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -258,6 +339,58 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods")
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @jakarta.annotation.Nullable
+  @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order status")
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -273,12 +406,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -291,6 +426,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java
index a314bb8d5294..fef53959fc69 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @jakarta.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index a314bb8d5294..fef53959fc69 100644
--- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @jakarta.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/restclient/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/restclient/docs/Order.md b/samples/client/petstore/java/restclient/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/restclient/docs/Order.md
+++ b/samples/client/petstore/java/restclient/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
index a314bb8d5294..fef53959fc69 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @jakarta.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/resteasy/api/openapi.yaml
+++ b/samples/client/petstore/java/resteasy/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resteasy/docs/Order.md b/samples/client/petstore/java/resteasy/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/resteasy/docs/Order.md
+++ b/samples/client/petstore/java/resteasy/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 0e1782a89015..483c9d243f03 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -265,12 +396,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -283,6 +416,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index 4310a4b7fd74..f91b3bb78dd4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -37,7 +38,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 @XmlRootElement(name = "Order")
@@ -117,6 +120,94 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  @XmlType(name="PaymentMethodEnum")
+  @XmlEnum(BigDecimal.class)
+  public enum PaymentMethodEnum {
+    @XmlEnumValue(new BigDecimal("1"))
+    NUMBER_1(new BigDecimal("1")),
+    
+    @XmlEnumValue(new BigDecimal("2"))
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @XmlElement(name = "paymentMethod")
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  @XmlType(name="OrderStatusEnum")
+  @XmlEnum(Object.class)
+  public enum OrderStatusEnum {
+    @XmlEnumValue("PENDING")
+    PENDING("PENDING"),
+    
+    @XmlEnumValue("PROCESSING")
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @XmlElement(name = "OrderStatus")
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -282,6 +373,60 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "paymentMethod")
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "paymentMethod")
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "OrderStatus")
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JacksonXmlProperty(localName = "OrderStatus")
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -297,12 +442,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -315,6 +462,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/resttemplate/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/resttemplate/docs/Order.md b/samples/client/petstore/java/resttemplate/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/resttemplate/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index bcff63f2a6bd..19bf436ff397 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,19 +101,99 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
   /**
    * Constructor with all args parameters
    */
-  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
+  public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete, @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) PaymentMethodEnum paymentMethod, @JsonProperty(JSON_PROPERTY_ORDER_STATUS) OrderStatusEnum orderStatus) {
     this.id = id;
     this.petId = petId;
     this.quantity = quantity;
     this.shipDate = shipDate;
     this.status = status;
     this.complete = complete;
+    this.paymentMethod = paymentMethod;
+    this.orderStatus = orderStatus;
   }
 
   public Order id(@javax.annotation.Nullable Long id) {
@@ -263,6 +346,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -278,12 +411,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -296,6 +431,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -347,6 +484,14 @@ public Order.Builder complete(Boolean complete) {
       this.instance.complete = complete;
       return this;
     }
+    public Order.Builder paymentMethod(PaymentMethodEnum paymentMethod) {
+      this.instance.paymentMethod = paymentMethod;
+      return this;
+    }
+    public Order.Builder orderStatus(OrderStatusEnum orderStatus) {
+      this.instance.orderStatus = orderStatus;
+      return this;
+    }
 
 
     /**
@@ -386,7 +531,9 @@ public Order.Builder toBuilder() {
       .quantity(getQuantity())
       .shipDate(getShipDate())
       .status(getStatus())
-      .complete(getComplete());
+      .complete(getComplete())
+      .paymentMethod(getPaymentMethod())
+      .orderStatus(getOrderStatus());
   }
 
 
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md b/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java
index 0e1782a89015..483c9d243f03 100644
--- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -265,12 +396,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -283,6 +416,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/vertx/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/vertx/docs/Order.md b/samples/client/petstore/java/vertx/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/vertx/docs/Order.md
+++ b/samples/client/petstore/java/vertx/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 0e1782a89015..483c9d243f03 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -265,12 +396,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -283,6 +416,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/Order.md b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/Order.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
index a314bb8d5294..fef53959fc69 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @jakarta.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @jakarta.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @jakarta.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/Order.md b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/Order.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index 4de247cdc05e..5690c98d4859 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -34,7 +35,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -99,6 +102,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -258,6 +339,58 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods")
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order status")
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -273,12 +406,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -291,6 +426,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index b0d7d12d6f62..8d163b2ea966 100644
--- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml
index 7f2dbb3ff954..f975bba3e6a0 100644
--- a/samples/client/petstore/java/webclient/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient/api/openapi.yaml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/client/petstore/java/webclient/docs/Order.md b/samples/client/petstore/java/webclient/docs/Order.md
index 27af32855c5c..802dce702f4d 100644
--- a/samples/client/petstore/java/webclient/docs/Order.md
+++ b/samples/client/petstore/java/webclient/docs/Order.md
@@ -13,6 +13,8 @@
 |**shipDate** | **OffsetDateTime** |  |  [optional] |
 |**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional] |
 |**complete** | **Boolean** |  |  [optional] |
+|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods |  [optional] |
+|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status |  [optional] |
 
 
 
@@ -26,3 +28,21 @@
 
 
 
+## Enum: PaymentMethodEnum
+
+| Name | Value |
+|---- | -----|
+| NUMBER_1 | new BigDecimal(&quot;1&quot;) |
+| NUMBER_2 | new BigDecimal(&quot;2&quot;) |
+
+
+
+## Enum: OrderStatusEnum
+
+| Name | Value |
+|---- | -----|
+| PENDING | &quot;PENDING&quot; |
+| PROCESSING | &quot;PROCESSING&quot; |
+
+
+
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index b0d7d12d6f62..8d163b2ea966 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @javax.annotation.Nullable
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @javax.annotation.Nullable
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @javax.annotation.Nullable
+  private OrderStatusEnum orderStatus;
+
   public Order() {
   }
 
@@ -251,6 +332,56 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   */
+  @javax.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -266,12 +397,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -284,6 +417,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/ruby-autoload/docs/Order.md b/samples/client/petstore/ruby-autoload/docs/Order.md
index a3fd55138068..cf618891943e 100644
--- a/samples/client/petstore/ruby-autoload/docs/Order.md
+++ b/samples/client/petstore/ruby-autoload/docs/Order.md
@@ -10,6 +10,8 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
+| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
+| **order_status** | **Object** | Order status | [optional] |
 
 ## Example
 
@@ -22,7 +24,9 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null
+  complete: null,
+  payment_method: 1,
+  order_status: null
 )
 ```
 
diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
index b18e3bb16d52..30338a865f7f 100644
--- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb
@@ -28,6 +28,12 @@ class Order
 
     attr_accessor :complete
 
+    # Various payment methods
+    attr_accessor :payment_method
+
+    # Order status
+    attr_accessor :order_status
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -58,7 +64,9 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete'
+        :'complete' => :'complete',
+        :'payment_method' => :'paymentMethod',
+        :'order_status' => :'OrderStatus'
       }
     end
 
@@ -80,7 +88,9 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean'
+        :'complete' => :'Boolean',
+        :'payment_method' => :'Float',
+        :'order_status' => :'Object'
       }
     end
 
@@ -131,6 +141,16 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
+
+      if attributes.key?(:'payment_method')
+        self.payment_method = attributes[:'payment_method']
+      else
+        self.payment_method = PAYMENT_METHOD::N1
+      end
+
+      if attributes.key?(:'order_status')
+        self.order_status = attributes[:'order_status']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,6 +167,10 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
+      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
+      return false unless payment_method_validator.valid?(@payment_method)
+      order_status_validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"])
+      return false unless order_status_validator.valid?(@order_status)
       true
     end
 
@@ -160,6 +184,26 @@ def status=(status)
       @status = status
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] payment_method Object to be assigned
+    def payment_method=(payment_method)
+      validator = EnumAttributeValidator.new('Float', [1, 2])
+      unless validator.valid?(payment_method)
+        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
+      end
+      @payment_method = payment_method
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] order_status Object to be assigned
+    def order_status=(order_status)
+      validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"])
+      unless validator.valid?(order_status)
+        fail ArgumentError, "invalid value for \"order_status\", must be one of #{validator.allowable_values}."
+      end
+      @order_status = order_status
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -170,7 +214,9 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete
+          complete == o.complete &&
+          payment_method == o.payment_method &&
+          order_status == o.order_status
     end
 
     # @see the `==` method
@@ -182,7 +228,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete].hash
+      [id, pet_id, quantity, ship_date, status, complete, payment_method, order_status].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/ruby-faraday/docs/Order.md b/samples/client/petstore/ruby-faraday/docs/Order.md
index a3fd55138068..cf618891943e 100644
--- a/samples/client/petstore/ruby-faraday/docs/Order.md
+++ b/samples/client/petstore/ruby-faraday/docs/Order.md
@@ -10,6 +10,8 @@
 | **ship_date** | **Time** |  | [optional] |
 | **status** | **String** | Order Status | [optional] |
 | **complete** | **Boolean** |  | [optional][default to false] |
+| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] |
+| **order_status** | **Object** | Order status | [optional] |
 
 ## Example
 
@@ -22,7 +24,9 @@ instance = Petstore::Order.new(
   quantity: null,
   ship_date: null,
   status: null,
-  complete: null
+  complete: null,
+  payment_method: 1,
+  order_status: null
 )
 ```
 
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
index b18e3bb16d52..30338a865f7f 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb
@@ -28,6 +28,12 @@ class Order
 
     attr_accessor :complete
 
+    # Various payment methods
+    attr_accessor :payment_method
+
+    # Order status
+    attr_accessor :order_status
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -58,7 +64,9 @@ def self.attribute_map
         :'quantity' => :'quantity',
         :'ship_date' => :'shipDate',
         :'status' => :'status',
-        :'complete' => :'complete'
+        :'complete' => :'complete',
+        :'payment_method' => :'paymentMethod',
+        :'order_status' => :'OrderStatus'
       }
     end
 
@@ -80,7 +88,9 @@ def self.openapi_types
         :'quantity' => :'Integer',
         :'ship_date' => :'Time',
         :'status' => :'String',
-        :'complete' => :'Boolean'
+        :'complete' => :'Boolean',
+        :'payment_method' => :'Float',
+        :'order_status' => :'Object'
       }
     end
 
@@ -131,6 +141,16 @@ def initialize(attributes = {})
       else
         self.complete = false
       end
+
+      if attributes.key?(:'payment_method')
+        self.payment_method = attributes[:'payment_method']
+      else
+        self.payment_method = PAYMENT_METHOD::N1
+      end
+
+      if attributes.key?(:'order_status')
+        self.order_status = attributes[:'order_status']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -147,6 +167,10 @@ def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"])
       return false unless status_validator.valid?(@status)
+      payment_method_validator = EnumAttributeValidator.new('Float', [1, 2])
+      return false unless payment_method_validator.valid?(@payment_method)
+      order_status_validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"])
+      return false unless order_status_validator.valid?(@order_status)
       true
     end
 
@@ -160,6 +184,26 @@ def status=(status)
       @status = status
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] payment_method Object to be assigned
+    def payment_method=(payment_method)
+      validator = EnumAttributeValidator.new('Float', [1, 2])
+      unless validator.valid?(payment_method)
+        fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}."
+      end
+      @payment_method = payment_method
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] order_status Object to be assigned
+    def order_status=(order_status)
+      validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"])
+      unless validator.valid?(order_status)
+        fail ArgumentError, "invalid value for \"order_status\", must be one of #{validator.allowable_values}."
+      end
+      @order_status = order_status
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -170,7 +214,9 @@ def ==(o)
           quantity == o.quantity &&
           ship_date == o.ship_date &&
           status == o.status &&
-          complete == o.complete
+          complete == o.complete &&
+          payment_method == o.payment_method &&
+          order_status == o.order_status
     end
 
     # @see the `==` method
@@ -182,7 +228,7 @@ def eql?(o)
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, pet_id, quantity, ship_date, status, complete].hash
+      [id, pet_id, quantity, ship_date, status, complete, payment_method, order_status].hash
     end
 
     # Builds the object from hash
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
index 2e9a77af0484..d61a60cbaea9 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts
@@ -55,6 +55,18 @@ export interface Order {
      * @memberof Order
      */
     complete?: boolean;
+    /**
+     * Various payment methods
+     * @type {number}
+     * @memberof Order
+     */
+    paymentMethod?: OrderPaymentMethodEnum;
+    /**
+     * Order status
+     * @type {object}
+     * @memberof Order
+     */
+    orderStatus?: OrderOrderStatusEnum;
 }
 
 
@@ -68,6 +80,24 @@ export const OrderStatusEnum = {
 } as const;
 export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum];
 
+/**
+ * @export
+ */
+export const OrderPaymentMethodEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2
+} as const;
+export type OrderPaymentMethodEnum = typeof OrderPaymentMethodEnum[keyof typeof OrderPaymentMethodEnum];
+
+/**
+ * @export
+ */
+export const OrderOrderStatusEnum = {
+    Pending: 'PENDING',
+    Processing: 'PROCESSING'
+} as const;
+export type OrderOrderStatusEnum = typeof OrderOrderStatusEnum[keyof typeof OrderOrderStatusEnum];
+
 
 /**
  * Check if a given object implements the Order interface.
@@ -92,6 +122,8 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord
         'shipDate': json['shipDate'] == null ? undefined : (new Date(json['shipDate'])),
         'status': json['status'] == null ? undefined : json['status'],
         'complete': json['complete'] == null ? undefined : json['complete'],
+        'paymentMethod': json['paymentMethod'] == null ? undefined : json['paymentMethod'],
+        'orderStatus': json['OrderStatus'] == null ? undefined : json['OrderStatus'],
     };
 }
 
@@ -112,6 +144,8 @@ export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: bool
         'shipDate': value['shipDate'] == null ? undefined : ((value['shipDate']).toISOString()),
         'status': value['status'],
         'complete': value['complete'],
+        'paymentMethod': value['paymentMethod'],
+        'OrderStatus': value['orderStatus'],
     };
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
index bde5ffe51a2c..3394b7c31365 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/Order.md
@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
+**orderStatus** | **Object** | Order status | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
index dfbc4f5c5e41..ddc841257a53 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
@@ -29,6 +29,10 @@ class Order {
      this.status,
 
      this.complete = false,
+
+     this.paymentMethod = const OrderPaymentMethodEnum._(1),
+
+     this.orderStatus,
   });
 
   @JsonKey(
@@ -105,6 +109,34 @@ class Order {
 
 
 
+      /// Various payment methods
+  @JsonKey(
+    defaultValue: 1,
+    name: r'paymentMethod',
+    required: false,
+    includeIfNull: false,
+  unknownEnumValue: OrderPaymentMethodEnum.unknownDefaultOpenApi,
+  )
+
+
+  final OrderPaymentMethodEnum? paymentMethod;
+
+
+
+      /// Order status
+  @JsonKey(
+    
+    name: r'OrderStatus',
+    required: false,
+    includeIfNull: false,
+  unknownEnumValue: OrderOrderStatusEnum.unknownDefaultOpenApi,
+  )
+
+
+  final OrderOrderStatusEnum? orderStatus;
+
+
+
 
 
     @override
@@ -114,7 +146,9 @@ class Order {
       other.quantity == quantity &&
       other.shipDate == shipDate &&
       other.status == status &&
-      other.complete == complete;
+      other.complete == complete &&
+      other.paymentMethod == paymentMethod &&
+      other.orderStatus == orderStatus;
 
     @override
     int get hashCode =>
@@ -123,7 +157,9 @@ class Order {
         quantity.hashCode +
         shipDate.hashCode +
         status.hashCode +
-        complete.hashCode;
+        complete.hashCode +
+        paymentMethod.hashCode +
+        orderStatus.hashCode;
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 
@@ -160,3 +196,45 @@ String toString() => value;
 }
 
 
+/// Various payment methods
+enum OrderPaymentMethodEnum {
+    /// Various payment methods
+@JsonValue('1')
+n1(''1''),
+    /// Various payment methods
+@JsonValue('2')
+n2(''2''),
+    /// Various payment methods
+@JsonValue('11184809')
+unknownDefaultOpenApi(''11184809'');
+
+const OrderPaymentMethodEnum(this.value);
+
+final String value;
+
+@override
+String toString() => value;
+}
+
+
+/// Order status
+enum OrderOrderStatusEnum {
+    /// Order status
+@JsonValue('PENDING')
+PENDING(''PENDING''),
+    /// Order status
+@JsonValue('PROCESSING')
+PROCESSING(''PROCESSING''),
+    /// Order status
+@JsonValue('11184809')
+unknownDefaultOpenApi(''11184809'');
+
+const OrderOrderStatusEnum(this.value);
+
+final String value;
+
+@override
+String toString() => value;
+}
+
+
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
index bde5ffe51a2c..9976da00ff3d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/Order.md
@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
+**orderStatus** | [**JsonObject**](.md) | Order status | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
index a44e1b340c1e..357fd687065b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
@@ -4,6 +4,7 @@
 
 // ignore_for_file: unused_element
 import 'package:built_collection/built_collection.dart';
+import 'package:built_value/json_object.dart';
 import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
 
@@ -18,6 +19,8 @@ part 'order.g.dart';
 /// * [shipDate] 
 /// * [status] - Order Status
 /// * [complete] 
+/// * [paymentMethod] - Various payment methods
+/// * [orderStatus] - Order status
 @BuiltValue()
 abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'id')
@@ -40,13 +43,24 @@ abstract class Order implements Built<Order, OrderBuilder> {
   @BuiltValueField(wireName: r'complete')
   bool? get complete;
 
+  /// Various payment methods
+  @BuiltValueField(wireName: r'paymentMethod')
+  OrderPaymentMethodEnum? get paymentMethod;
+  // enum paymentMethodEnum {  1,  2,  };
+
+  /// Order status
+  @BuiltValueField(wireName: r'OrderStatus')
+  OrderOrderStatusEnum? get orderStatus;
+  // enum orderStatusEnum {  PENDING,  PROCESSING,  };
+
   Order._();
 
   factory Order([void updates(OrderBuilder b)]) = _$Order;
 
   @BuiltValueHook(initializeBuilder: true)
   static void _defaults(OrderBuilder b) => b
-      ..complete = false;
+      ..complete = false
+      ..paymentMethod = const OrderPaymentMethodEnum._(1);
 
   @BuiltValueSerializer(custom: true)
   static Serializer<Order> get serializer => _$OrderSerializer();
@@ -106,6 +120,20 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
         specifiedType: const FullType(bool),
       );
     }
+    if (object.paymentMethod != null) {
+      yield r'paymentMethod';
+      yield serializers.serialize(
+        object.paymentMethod,
+        specifiedType: const FullType(OrderPaymentMethodEnum),
+      );
+    }
+    if (object.orderStatus != null) {
+      yield r'OrderStatus';
+      yield serializers.serialize(
+        object.orderStatus,
+        specifiedType: const FullType(OrderOrderStatusEnum),
+      );
+    }
   }
 
   @override
@@ -171,6 +199,20 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
           ) as bool;
           result.complete = valueDes;
           break;
+        case r'paymentMethod':
+          final valueDes = serializers.deserialize(
+            value,
+            specifiedType: const FullType(OrderPaymentMethodEnum),
+          ) as OrderPaymentMethodEnum;
+          result.paymentMethod = valueDes;
+          break;
+        case r'OrderStatus':
+          final valueDes = serializers.deserialize(
+            value,
+            specifiedType: const FullType(OrderOrderStatusEnum),
+          ) as OrderOrderStatusEnum;
+          result.orderStatus = valueDes;
+          break;
         default:
           unhandled.add(key);
           unhandled.add(value);
@@ -223,3 +265,43 @@ class OrderStatusEnum extends EnumClass {
   static OrderStatusEnum valueOf(String name) => _$orderStatusEnumValueOf(name);
 }
 
+class OrderPaymentMethodEnum extends EnumClass {
+
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'1')
+  static const OrderPaymentMethodEnum n1 = _$orderPaymentMethodEnum_n1;
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'2')
+  static const OrderPaymentMethodEnum n2 = _$orderPaymentMethodEnum_n2;
+  /// Various payment methods
+  @BuiltValueEnumConst(wireName: r'11184809', fallback: true)
+  static const OrderPaymentMethodEnum unknownDefaultOpenApi = _$orderPaymentMethodEnum_unknownDefaultOpenApi;
+
+  static Serializer<OrderPaymentMethodEnum> get serializer => _$orderPaymentMethodEnumSerializer;
+
+  const OrderPaymentMethodEnum._(String name): super(name);
+
+  static BuiltSet<OrderPaymentMethodEnum> get values => _$orderPaymentMethodEnumValues;
+  static OrderPaymentMethodEnum valueOf(String name) => _$orderPaymentMethodEnumValueOf(name);
+}
+
+class OrderOrderStatusEnum extends EnumClass {
+
+  /// Order status
+  @BuiltValueEnumConst(wireName: r'PENDING')
+  static const OrderOrderStatusEnum PENDING = _$orderOrderStatusEnum_PENDING;
+  /// Order status
+  @BuiltValueEnumConst(wireName: r'PROCESSING')
+  static const OrderOrderStatusEnum PROCESSING = _$orderOrderStatusEnum_PROCESSING;
+  /// Order status
+  @BuiltValueEnumConst(wireName: r'11184809', fallback: true)
+  static const OrderOrderStatusEnum unknownDefaultOpenApi = _$orderOrderStatusEnum_unknownDefaultOpenApi;
+
+  static Serializer<OrderOrderStatusEnum> get serializer => _$orderOrderStatusEnumSerializer;
+
+  const OrderOrderStatusEnum._(String name): super(name);
+
+  static BuiltSet<OrderOrderStatusEnum> get values => _$orderOrderStatusEnumValues;
+  static OrderOrderStatusEnum valueOf(String name) => _$orderOrderStatusEnumValueOf(name);
+}
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
index bde5ffe51a2c..1b69cc6c7a70 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/Order.md
@@ -14,6 +14,8 @@ Name | Type | Description | Notes
 **shipDate** | [**DateTime**](DateTime.md) |  | [optional] 
 **status** | **String** | Order Status | [optional] 
 **complete** | **bool** |  | [optional] [default to false]
+**paymentMethod** | **num** | Various payment methods | [optional] [default to 1]
+**orderStatus** | [**Object**](.md) | Order status | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
index bc591de9fab9..67624bd9f3fe 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
@@ -19,6 +19,8 @@ class Order {
     this.shipDate,
     this.status,
     this.complete = false,
+    this.paymentMethod = const OrderPaymentMethodEnum._(1),
+    this.orderStatus,
   });
 
   ///
@@ -58,6 +60,12 @@ class Order {
 
   bool complete;
 
+  /// Various payment methods
+  OrderPaymentMethodEnum paymentMethod;
+
+  /// Order status
+  OrderOrderStatusEnum? orderStatus;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is Order &&
     other.id == id &&
@@ -65,7 +73,9 @@ class Order {
     other.quantity == quantity &&
     other.shipDate == shipDate &&
     other.status == status &&
-    other.complete == complete;
+    other.complete == complete &&
+    other.paymentMethod == paymentMethod &&
+    other.orderStatus == orderStatus;
 
   @override
   int get hashCode =>
@@ -75,10 +85,12 @@ class Order {
     (quantity == null ? 0 : quantity!.hashCode) +
     (shipDate == null ? 0 : shipDate!.hashCode) +
     (status == null ? 0 : status!.hashCode) +
-    (complete.hashCode);
+    (complete.hashCode) +
+    (paymentMethod.hashCode) +
+    (orderStatus == null ? 0 : orderStatus!.hashCode);
 
   @override
-  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete]';
+  String toString() => 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete, paymentMethod=$paymentMethod, orderStatus=$orderStatus]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -108,6 +120,12 @@ class Order {
       json[r'status'] = null;
     }
       json[r'complete'] = this.complete;
+      json[r'paymentMethod'] = this.paymentMethod;
+    if (this.orderStatus != null) {
+      json[r'OrderStatus'] = this.orderStatus;
+    } else {
+      json[r'OrderStatus'] = null;
+    }
     return json;
   }
 
@@ -136,6 +154,8 @@ class Order {
         shipDate: mapDateTime(json, r'shipDate', r''),
         status: OrderStatusEnum.fromJson(json[r'status']),
         complete: mapValueOfType<bool>(json, r'complete') ?? false,
+        paymentMethod: OrderPaymentMethodEnum.parse('${json[r'paymentMethod']}'),
+        orderStatus: OrderOrderStatusEnum.fromJson(json[r'OrderStatus']),
       );
     }
     return null;
@@ -263,3 +283,151 @@ class OrderStatusEnumTypeTransformer {
 }
 
 
+/// Various payment methods
+class OrderPaymentMethodEnum {
+  /// Instantiate a new enum with the provided [value].
+  const OrderPaymentMethodEnum._(this.value);
+
+  /// The underlying value of this enum member.
+  final num value;
+
+  @override
+  String toString() => value.toString();
+
+  num toJson() => value;
+
+  static const n1 = OrderPaymentMethodEnum._('1');
+  static const n2 = OrderPaymentMethodEnum._('2');
+
+  /// List of all possible values in this [enum][OrderPaymentMethodEnum].
+  static const values = <OrderPaymentMethodEnum>[
+    n1,
+    n2,
+  ];
+
+  static OrderPaymentMethodEnum? fromJson(dynamic value) => OrderPaymentMethodEnumTypeTransformer().decode(value);
+
+  static List<OrderPaymentMethodEnum> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <OrderPaymentMethodEnum>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = OrderPaymentMethodEnum.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [OrderPaymentMethodEnum] to num,
+/// and [decode] dynamic data back to [OrderPaymentMethodEnum].
+class OrderPaymentMethodEnumTypeTransformer {
+  factory OrderPaymentMethodEnumTypeTransformer() => _instance ??= const OrderPaymentMethodEnumTypeTransformer._();
+
+  const OrderPaymentMethodEnumTypeTransformer._();
+
+  num encode(OrderPaymentMethodEnum data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a OrderPaymentMethodEnum.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  OrderPaymentMethodEnum? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case '1': return OrderPaymentMethodEnum.n1;
+        case '2': return OrderPaymentMethodEnum.n2;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [OrderPaymentMethodEnumTypeTransformer] instance.
+  static OrderPaymentMethodEnumTypeTransformer? _instance;
+}
+
+
+/// Order status
+class OrderOrderStatusEnum {
+  /// Instantiate a new enum with the provided [value].
+  const OrderOrderStatusEnum._(this.value);
+
+  /// The underlying value of this enum member.
+  final Object value;
+
+  @override
+  String toString() => value.toString();
+
+  Object toJson() => value;
+
+  static const PENDING = OrderOrderStatusEnum._('PENDING');
+  static const PROCESSING = OrderOrderStatusEnum._('PROCESSING');
+
+  /// List of all possible values in this [enum][OrderOrderStatusEnum].
+  static const values = <OrderOrderStatusEnum>[
+    PENDING,
+    PROCESSING,
+  ];
+
+  static OrderOrderStatusEnum? fromJson(dynamic value) => OrderOrderStatusEnumTypeTransformer().decode(value);
+
+  static List<OrderOrderStatusEnum> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <OrderOrderStatusEnum>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = OrderOrderStatusEnum.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [OrderOrderStatusEnum] to Object,
+/// and [decode] dynamic data back to [OrderOrderStatusEnum].
+class OrderOrderStatusEnumTypeTransformer {
+  factory OrderOrderStatusEnumTypeTransformer() => _instance ??= const OrderOrderStatusEnumTypeTransformer._();
+
+  const OrderOrderStatusEnumTypeTransformer._();
+
+  Object encode(OrderOrderStatusEnum data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a OrderOrderStatusEnum.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  OrderOrderStatusEnum? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case 'PENDING': return OrderOrderStatusEnum.PENDING;
+        case 'PROCESSING': return OrderOrderStatusEnum.PROCESSING;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [OrderOrderStatusEnumTypeTransformer] instance.
+  static OrderOrderStatusEnumTypeTransformer? _instance;
+}
+
+
diff --git a/samples/schema/petstore/mysql/Model/Order.sql b/samples/schema/petstore/mysql/Model/Order.sql
index 43af471ffb5c..efe3b21b4ffe 100644
--- a/samples/schema/petstore/mysql/Model/Order.sql
+++ b/samples/schema/petstore/mysql/Model/Order.sql
@@ -7,17 +7,17 @@
 --
 -- SELECT template for table `Order`
 --
-SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete` FROM `Order` WHERE 1;
+SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`, `OrderStatus` FROM `Order` WHERE 1;
 
 --
 -- INSERT template for table `Order`
 --
-INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`) VALUES (?, ?, ?, ?, ?, ?);
+INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`, `OrderStatus`) VALUES (?, ?, ?, ?, ?, ?, ?, ?);
 
 --
 -- UPDATE template for table `Order`
 --
-UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ? WHERE 1;
+UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ?, `paymentMethod` = ?, `OrderStatus` = ? WHERE 1;
 
 --
 -- DELETE template for table `Order`
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index 0c526bdabd3e..39646b1f0c31 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -352,7 +352,9 @@ CREATE TABLE IF NOT EXISTS `Order` (
   `quantity` INT DEFAULT NULL,
   `shipDate` DATETIME DEFAULT NULL,
   `status` ENUM('placed', 'approved', 'delivered') DEFAULT NULL COMMENT 'Order Status',
-  `complete` TINYINT(1) DEFAULT false
+  `complete` TINYINT(1) DEFAULT false,
+  `paymentMethod` ENUM('1', '2') DEFAULT '1' COMMENT 'Various payment methods',
+  `OrderStatus` JSON DEFAULT NULL COMMENT 'Order status'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
index e1fb8817f3ba..a024252604cf 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp
@@ -69,6 +69,7 @@ ptree Order::toPropertyTree() const
 	pt.put("shipDate", m_ShipDate);
 	pt.put("status", m_Status);
 	pt.put("complete", m_Complete);
+	pt.put("paymentMethod", m_PaymentMethod);
 	return pt;
 }
 
@@ -81,6 +82,8 @@ void Order::fromPropertyTree(ptree const &pt)
 	m_ShipDate = pt.get("shipDate", "");
 	setStatus(pt.get("status", ""));
 	m_Complete = pt.get("complete", false);
+	setPaymentMethod(pt.get("paymentMethod", 1));
+	setOrderStatus(pt.get("OrderStatus", std::string{}));
 }
 
 int64_t Order::getId() const
@@ -157,6 +160,44 @@ void Order::setComplete(bool value)
 }
 
 
+double Order::getPaymentMethod() const
+{
+    return m_PaymentMethod;
+}
+
+void Order::setPaymentMethod(double value)
+{
+    static const std::array<double, 2> allowedValues = {
+        1, 2
+    };
+
+    if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) {
+		m_PaymentMethod = value;
+	} else {
+		throw std::runtime_error("Value " + boost::lexical_cast<std::string>(value) + " not allowed");
+	}
+}
+
+
+std::string Order::getOrderStatus() const
+{
+    return m_OrderStatus;
+}
+
+void Order::setOrderStatus(std::string value)
+{
+    static const std::array<std::string, 2> allowedValues = {
+        "PENDING", "PROCESSING"
+    };
+
+    if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) {
+		m_OrderStatus = value;
+	} else {
+		throw std::runtime_error("Value " + boost::lexical_cast<std::string>(value) + " not allowed");
+	}
+}
+
+
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json)
 {
diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
index eccfec8de093..8dcac69e8271 100644
--- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
+++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h
@@ -94,6 +94,18 @@ class  Order
     bool isComplete() const;
     void setComplete(bool value);
 
+    /// <summary>
+    /// Various payment methods
+    /// </summary>
+    double getPaymentMethod() const;
+    void setPaymentMethod(double value);
+
+    /// <summary>
+    /// Order status
+    /// </summary>
+    std::string getOrderStatus() const;
+    void setOrderStatus(std::string value);
+
 protected:
     int64_t m_Id = 0L;
     int64_t m_PetId = 0L;
@@ -101,6 +113,8 @@ class  Order
     std::string m_ShipDate = "";
     std::string m_Status = "";
     bool m_Complete = false;
+    double m_PaymentMethod = 1;
+    std::string m_OrderStatus = std::string{};
 };
 
 std::vector<Order> createOrderVectorFromJsonString(const std::string& json);
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
index 707cdd3797f9..c3dbfcccb3fb 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,6 +14,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -88,6 +89,110 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+
+    private Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into Object, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static OrderStatusEnum fromString(String s) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -208,6 +313,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -223,6 +368,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..702165a01c9e 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+    /**
+    * Order status
+    */
+    public enum OrderStatusEnum {
+        PENDING("PENDING"),
+        PROCESSING("PROCESSING");
+
+        private Object value;
+
+        OrderStatusEnum(Object value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public Object getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static OrderStatusEnum fromValue(String text) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private OrderStatusEnum orderStatus;
+
     /**
      * Default constructor.
      */
@@ -71,6 +148,8 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
+     * @param orderStatus Order status
      */
     public Order(
         Long id, 
@@ -78,7 +157,9 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod, 
+        OrderStatusEnum orderStatus
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +167,8 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
+        this.orderStatus = orderStatus;
     }
 
 
@@ -162,6 +245,30 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    /**
+     * Order status
+     * @return orderStatus
+     */
+    public OrderStatusEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(OrderStatusEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +283,8 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+        sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
index 707cdd3797f9..c3dbfcccb3fb 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -14,6 +14,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -88,6 +89,110 @@ public static StatusEnum fromValue(String value) {
 
   private Boolean complete = false;
 
+public enum PaymentMethodEnum {
+
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Various payment methods
+  **/
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+
+    private Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into Object, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static OrderStatusEnum fromString(String s) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+ /**
+   * Order status
+  **/
+  private OrderStatusEnum orderStatus;
+
  /**
    * Get id
    * @return id
@@ -208,6 +313,46 @@ public Order complete(Boolean complete) {
     return this;
   }
 
+ /**
+   * Various payment methods
+   * @return paymentMethod
+  **/
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  /**
+    * Set paymentMethod
+  **/
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+ /**
+   * Order status
+   * @return orderStatus
+  **/
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  /**
+    * Set orderStatus
+  **/
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
 
   /**
     * Create a string representation of this pojo.
@@ -223,6 +368,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..702165a01c9e 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+    /**
+    * Order status
+    */
+    public enum OrderStatusEnum {
+        PENDING("PENDING"),
+        PROCESSING("PROCESSING");
+
+        private Object value;
+
+        OrderStatusEnum(Object value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public Object getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static OrderStatusEnum fromValue(String text) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private OrderStatusEnum orderStatus;
+
     /**
      * Default constructor.
      */
@@ -71,6 +148,8 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
+     * @param orderStatus Order status
      */
     public Order(
         Long id, 
@@ -78,7 +157,9 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod, 
+        OrderStatusEnum orderStatus
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +167,8 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
+        this.orderStatus = orderStatus;
     }
 
 
@@ -162,6 +245,30 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    /**
+     * Order status
+     * @return orderStatus
+     */
+    public OrderStatusEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(OrderStatusEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +283,8 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+        sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..702165a01c9e 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+    /**
+    * Order status
+    */
+    public enum OrderStatusEnum {
+        PENDING("PENDING"),
+        PROCESSING("PROCESSING");
+
+        private Object value;
+
+        OrderStatusEnum(Object value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public Object getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static OrderStatusEnum fromValue(String text) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private OrderStatusEnum orderStatus;
+
     /**
      * Default constructor.
      */
@@ -71,6 +148,8 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
+     * @param orderStatus Order status
      */
     public Order(
         Long id, 
@@ -78,7 +157,9 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod, 
+        OrderStatusEnum orderStatus
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +167,8 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
+        this.orderStatus = orderStatus;
     }
 
 
@@ -162,6 +245,30 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    /**
+     * Order status
+     * @return orderStatus
+     */
+    public OrderStatusEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(OrderStatusEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +283,8 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+        sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
index 0ca5e240f6f6..702165a01c9e 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import jakarta.validation.constraints.*;
 import jakarta.validation.Valid;
@@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) {
     private StatusEnum status;
     private Boolean complete = false;
 
+    /**
+    * Various payment methods
+    */
+    public enum PaymentMethodEnum {
+        NUMBER_1(new BigDecimal("1")),
+        NUMBER_2(new BigDecimal("2"));
+
+        private BigDecimal value;
+
+        PaymentMethodEnum(BigDecimal value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public BigDecimal getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static PaymentMethodEnum fromValue(String text) {
+            for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+    /**
+    * Order status
+    */
+    public enum OrderStatusEnum {
+        PENDING("PENDING"),
+        PROCESSING("PROCESSING");
+
+        private Object value;
+
+        OrderStatusEnum(Object value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public Object getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+
+
+        @JsonCreator
+        public static OrderStatusEnum fromValue(String text) {
+            for (OrderStatusEnum b : OrderStatusEnum.values()) {
+                if (String.valueOf(b.value).equals(text)) {
+                    return b;
+                }
+            }
+            throw new IllegalArgumentException("Unexpected value '" + text + "'");
+        }
+    }
+
+
+    private OrderStatusEnum orderStatus;
+
     /**
      * Default constructor.
      */
@@ -71,6 +148,8 @@ public Order() {
      * @param shipDate shipDate
      * @param status Order Status
      * @param complete complete
+     * @param paymentMethod Various payment methods
+     * @param orderStatus Order status
      */
     public Order(
         Long id, 
@@ -78,7 +157,9 @@ public Order(
         Integer quantity, 
         OffsetDateTime shipDate, 
         StatusEnum status, 
-        Boolean complete
+        Boolean complete, 
+        PaymentMethodEnum paymentMethod, 
+        OrderStatusEnum orderStatus
     ) {
         this.id = id;
         this.petId = petId;
@@ -86,6 +167,8 @@ public Order(
         this.shipDate = shipDate;
         this.status = status;
         this.complete = complete;
+        this.paymentMethod = paymentMethod;
+        this.orderStatus = orderStatus;
     }
 
 
@@ -162,6 +245,30 @@ public void setComplete(Boolean complete) {
         this.complete = complete;
     }
 
+    /**
+     * Various payment methods
+     * @return paymentMethod
+     */
+    public PaymentMethodEnum getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    /**
+     * Order status
+     * @return orderStatus
+     */
+    public OrderStatusEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(OrderStatusEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
     /**
       * Create a string representation of this pojo.
     **/
@@ -176,6 +283,8 @@ public String toString() {
         sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
         sb.append("    status: ").append(toIndentedString(status)).append("\n");
         sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+        sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+        sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
index d0bbfe56d0fd..8bde7b4f8db9 100644
--- a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml
@@ -1436,8 +1436,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1465,6 +1467,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
index 31031beb5379..a2f20041f9f6 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
@@ -55,7 +55,7 @@ public class Order  {
 
   public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
index d1e447e3d9cd..d73e4ee930a5 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
@@ -63,7 +63,7 @@ public class Pet  {
 
   public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
index 20c5aa09078a..c44205983a7e 100644
--- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
+++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java
@@ -131,10 +131,10 @@ public static MappingBuilder stubGetOrderByIdFault(@javax.annotation.Nonnull Str
     }
 
     public static String getOrderById200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String getOrderById200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> <OrderStatus>UNDEFINED_EXAMPLE_VALUE</OrderStatus> </Order>";
     }
 
 
@@ -180,14 +180,14 @@ public static MappingBuilder stubPlaceOrderFault(@javax.annotation.Nonnull Strin
     }
 
     public static String placeOrder200ResponseSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
     public static String placeOrder200ResponseSample2() {
-        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> </Order>";
+        return "<Order> <id>123456789</id> <petId>123456789</petId> <quantity>123</quantity> <shipDate>2000-01-23T04:56:07.000Z</shipDate> <status>aeiou</status> <complete>true</complete> <paymentMethod>1</paymentMethod> <OrderStatus>UNDEFINED_EXAMPLE_VALUE</OrderStatus> </Order>";
     }
 
     public static String placeOrderRequestSample1() {
-        return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
+        return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }";
     }
 
 
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 f876902045ff..164253d7d690 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
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import javax.validation.constraints.*;
@@ -33,7 +34,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  private OrderStatusEnum orderStatus;
+
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -218,6 +299,46 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(value = "paymentMethod")
+  @ApiModelProperty(example = "1", value = "Various payment methods")
+  
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   **/
+  @JsonProperty(value = "OrderStatus")
+  @ApiModelProperty(value = "Order status")
+  
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -233,12 +354,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -252,6 +375,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
index 64044f795460..ac3c0b47eaef 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,6 @@
 package org.openapitools.model;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import javax.validation.constraints.*;
@@ -70,6 +71,102 @@ public static StatusEnum fromValue(String value) {
 
   private StatusEnum status;
   private Boolean complete = false;
+  public enum PaymentMethodEnum {
+
+    NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2")));
+
+
+    private BigDecimal value;
+
+    PaymentMethodEnum (BigDecimal v) {
+        value = v;
+    }
+
+    public BigDecimal value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into BigDecimal, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static PaymentMethodEnum fromString(String s) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+        for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+  public enum OrderStatusEnum {
+
+    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+
+
+    private Object value;
+
+    OrderStatusEnum (Object v) {
+        value = v;
+    }
+
+    public Object value() {
+        return value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+        return String.valueOf(value);
+    }
+
+    /**
+     * Convert a String into Object, as specified in the
+     * <a href="https://download.oracle.com/otndocs/jcp/jaxrs-2_0-fr-eval-spec/index.html">See JAX RS 2.0 Specification, section 3.2, p. 12</a>
+     */
+    public static OrderStatusEnum fromString(String s) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            // using Objects.toString() to be safe if value type non-object type
+            // because types like 'int' etc. will be auto-boxed
+            if (java.util.Objects.toString(b.value).equals(s)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected string value '" + s + "'");
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+        for (OrderStatusEnum b : OrderStatusEnum.values()) {
+            if (b.value.equals(value)) {
+                return b;
+            }
+        }
+        throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+}
+
+  private OrderStatusEnum orderStatus;
 
   protected Order(OrderBuilder<?, ?> b) {
     this.id = b.id;
@@ -78,6 +175,8 @@ protected Order(OrderBuilder<?, ?> b) {
     this.shipDate = b.shipDate;
     this.status = b.status;
     this.complete = b.complete;
+    this.paymentMethod = b.paymentMethod;
+    this.orderStatus = b.orderStatus;
   }
 
   public Order() {
@@ -198,6 +297,46 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  /**
+   * Various payment methods
+   **/
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  
+  @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1", description = "Various payment methods")
+  @JsonProperty("paymentMethod")
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  @JsonProperty("paymentMethod")
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  /**
+   * Order status
+   **/
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  
+  @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "Order status")
+  @JsonProperty("OrderStatus")
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  @JsonProperty("OrderStatus")
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -213,12 +352,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -232,6 +373,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -272,6 +415,8 @@ public static abstract class OrderBuilder<C extends Order, B extends OrderBuilde
     private LocalDateTime shipDate;
     private StatusEnum status;
     private Boolean complete = false;
+    private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+    private OrderStatusEnum orderStatus;
     protected abstract B self();
 
     public abstract C build();
@@ -300,6 +445,14 @@ public B complete(Boolean complete) {
       this.complete = complete;
       return self();
     }
+    public B paymentMethod(PaymentMethodEnum paymentMethod) {
+      this.paymentMethod = paymentMethod;
+      return self();
+    }
+    public B orderStatus(OrderStatusEnum orderStatus) {
+      this.orderStatus = orderStatus;
+      return self();
+    }
   }
 }
 
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
index b3e702a2e0fe..54266e2c4247 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
@@ -1526,8 +1526,10 @@ components:
       type: string
     Order:
       example:
+        OrderStatus: "{}"
         petId: 6
         quantity: 1
+        paymentMethod: 1
         id: 0
         shipDate: 2000-01-23T04:56:07.000+00:00
         complete: false
@@ -1555,6 +1557,25 @@ components:
         complete:
           default: false
           type: boolean
+        paymentMethod:
+          default: 1
+          description: Various payment methods
+          enum:
+          - 1
+          - 2
+          example: 1
+          format: int32
+          type: number
+          x-enum-description:
+          - Paypal
+          - Creditcard
+        OrderStatus:
+          additionalProperties: false
+          description: Order status
+          enum:
+          - PENDING
+          - PROCESSING
+          type: object
       type: object
       xml:
         name: Order
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 5c96be8e0b05..67adf92cac4f 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
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import jakarta.validation.constraints.*;
@@ -32,7 +33,9 @@
   Order.JSON_PROPERTY_QUANTITY,
   Order.JSON_PROPERTY_SHIP_DATE,
   Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
+  Order.JSON_PROPERTY_COMPLETE,
+  Order.JSON_PROPERTY_PAYMENT_METHOD,
+  Order.JSON_PROPERTY_ORDER_STATUS
 })
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.14.0-SNAPSHOT")
 public class Order   {
@@ -97,6 +100,84 @@ public static StatusEnum fromValue(String value) {
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   private Boolean complete = false;
 
+  /**
+   * Various payment methods
+   */
+  public enum PaymentMethodEnum {
+    NUMBER_1(new BigDecimal("1")),
+    
+    NUMBER_2(new BigDecimal("2"));
+
+    private BigDecimal value;
+
+    PaymentMethodEnum(BigDecimal value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public BigDecimal getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static PaymentMethodEnum fromValue(BigDecimal value) {
+      for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod";
+  @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD)
+  private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
+
+  /**
+   * Order status
+   */
+  public enum OrderStatusEnum {
+    PENDING("PENDING"),
+    
+    PROCESSING("PROCESSING");
+
+    private Object value;
+
+    OrderStatusEnum(Object value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static OrderStatusEnum fromValue(Object value) {
+      for (OrderStatusEnum b : OrderStatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus";
+  @JsonProperty(JSON_PROPERTY_ORDER_STATUS)
+  private OrderStatusEnum orderStatus;
+
   public Order id(Long id) {
     this.id = id;
     return this;
@@ -217,6 +298,46 @@ public void setComplete(Boolean complete) {
     this.complete = complete;
   }
 
+  public Order paymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+    return this;
+  }
+
+  /**
+   * Various payment methods
+   * @return paymentMethod
+   **/
+  @JsonProperty(value = "paymentMethod")
+  @Schema(example = "1", description = "Various payment methods")
+  
+  public PaymentMethodEnum getPaymentMethod() {
+    return paymentMethod;
+  }
+
+  public void setPaymentMethod(PaymentMethodEnum paymentMethod) {
+    this.paymentMethod = paymentMethod;
+  }
+
+  public Order orderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+    return this;
+  }
+
+  /**
+   * Order status
+   * @return orderStatus
+   **/
+  @JsonProperty(value = "OrderStatus")
+  @Schema(description = "Order status")
+  
+  public OrderStatusEnum getOrderStatus() {
+    return orderStatus;
+  }
+
+  public void setOrderStatus(OrderStatusEnum orderStatus) {
+    this.orderStatus = orderStatus;
+  }
+
 
   @Override
   public boolean equals(Object o) {
@@ -232,12 +353,14 @@ public boolean equals(Object o) {
         Objects.equals(this.quantity, order.quantity) &&
         Objects.equals(this.shipDate, order.shipDate) &&
         Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
+        Objects.equals(this.complete, order.complete) &&
+        Objects.equals(this.paymentMethod, order.paymentMethod) &&
+        Objects.equals(this.orderStatus, order.orderStatus);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+    return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus);
   }
 
   @Override
@@ -251,6 +374,8 @@ public String toString() {
     sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");
     sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
+    sb.append("    orderStatus: ").append(toIndentedString(orderStatus)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index ce27417ec1da..06d86baa9fb5 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -60,6 +60,8 @@ Model/NullableClass.php
 Model/NumberOnly.php
 Model/ObjectWithDeprecatedFields.php
 Model/Order.php
+Model/OrderOrderStatus.php
+Model/OrderPaymentMethod.php
 Model/OrderStatus.php
 Model/OuterComposite.php
 Model/OuterEnum.php
diff --git a/samples/server/petstore/php-laravel/Model/Order.php b/samples/server/petstore/php-laravel/Model/Order.php
index 4a9f2eb3d572..21509e99d91c 100644
--- a/samples/server/petstore/php-laravel/Model/Order.php
+++ b/samples/server/petstore/php-laravel/Model/Order.php
@@ -51,6 +51,12 @@ class Order
     *
     * 
     * @param bool $complete
+    *
+    * 
+    * @param \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod
+    *
+    * 
+    * @param \OpenAPI\Server\Model\OrderOrderStatus $orderStatus
     */
 
     public function __construct(
@@ -60,6 +66,8 @@ public function __construct(
         public \DateTime $shipDate,
         public \OpenAPI\Server\Model\OrderStatus $status,
         public bool $complete = false,
+        public \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod,
+        public \OpenAPI\Server\Model\OrderOrderStatus $orderStatus,
     ) {}
 }
 

From c0ef1381a83d7d614a9869568a528db79d13be3a Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Mon, 2 Jun 2025 17:29:57 +0200
Subject: [PATCH 20/22] issue-20188: regenerate samples

---
 .../php-laravel/Model/OrderOrderStatus.php    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 samples/server/petstore/php-laravel/Model/OrderOrderStatus.php

diff --git a/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php b/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php
new file mode 100644
index 000000000000..efc3a7cccecd
--- /dev/null
+++ b/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php
@@ -0,0 +1,42 @@
+<?php declare(strict_types=1);
+
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ * PHP version 8.1
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI-Generator
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ * Source files are located at:
+ *
+ * > https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/
+ */
+
+
+/**
+ * OrderOrderStatus
+ */
+namespace OpenAPI\Server\Model;
+
+/**
+ * OrderOrderStatus
+ * @description Order status
+ */
+use Crell\Serde\Renaming\Cases;
+use Crell\Serde\Attributes as Serde;
+
+#[Serde\ClassSettings(renameWith: Cases::snake_case)]
+class OrderOrderStatus
+{
+    /**
+    */
+
+    public function __construct(
+    ) {}
+}
+

From 5cb9f0c9397f6127650f2639d2ab12b7f88b687f Mon Sep 17 00:00:00 2001
From: timon-sbr <timon.link@sbroker.de>
Date: Tue, 3 Jun 2025 13:40:42 +0200
Subject: [PATCH 21/22] Update
 modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache

Co-authored-by: martin-mfg <2026226+martin-mfg@users.noreply.github.com>
---
 .../resources/Java/libraries/microprofile/enumClass.mustache    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
index b1347308b52f..eaccbf3b7f42 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache
@@ -15,7 +15,7 @@
     {{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{^withXml}}
-        {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/withXml}}
     {{/allowableValues}}
 

From d7b3d934f42e12ba55ee908d3e6fb2087b6a4918 Mon Sep 17 00:00:00 2001
From: Timon Link <timon.link@sbroker.de>
Date: Tue, 3 Jun 2025 14:57:39 +0200
Subject: [PATCH 22/22] issue-20188: apply isFreeFromObject and isUri to more
 enum templates

---
 .../java-helidon/client/libraries/mp/enumClass.mustache   | 2 +-
 .../java-helidon/client/libraries/se/enumClass.mustache   | 2 +-
 .../java-helidon/server/libraries/mp/enumClass.mustache   | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../java/org/openapitools/client/model/EnumArrays.java    | 4 ++--
 .../main/java/org/openapitools/client/model/EnumTest.java | 8 ++++----
 .../main/java/org/openapitools/client/model/MapTest.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 6 +++---
 .../org/openapitools/client/model/ParentWithNullable.java | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../java/org/openapitools/client/model/EnumArrays.java    | 4 ++--
 .../main/java/org/openapitools/client/model/EnumTest.java | 8 ++++----
 .../main/java/org/openapitools/client/model/MapTest.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 6 +++---
 .../org/openapitools/client/model/ParentWithNullable.java | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../java/org/openapitools/client/model/EnumArrays.java    | 4 ++--
 .../main/java/org/openapitools/client/model/EnumTest.java | 8 ++++----
 .../main/java/org/openapitools/client/model/MapTest.java  | 2 +-
 .../main/java/org/openapitools/client/model/Order.java    | 6 +++---
 .../org/openapitools/client/model/ParentWithNullable.java | 2 +-
 .../src/main/java/org/openapitools/client/model/Pet.java  | 2 +-
 .../main/java/org/openapitools/server/model/Order.java    | 2 +-
 .../main/java/org/openapitools/server/model/Order.java    | 2 +-
 .../main/java/org/openapitools/server/model/Order.java    | 2 +-
 .../src/main/java/org/openapitools/server/model/Pet.java  | 2 +-
 35 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
index 84ba1d3eb5ce..0b843941b2a1 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache
@@ -5,7 +5,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
     {{dataType}} value;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
index 84ba1d3eb5ce..0b843941b2a1 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache
@@ -5,7 +5,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
     {{dataType}} value;
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
index 4df7005091ae..be0e4d16ef2b 100644
--- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache
@@ -1,7 +1,7 @@
 {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
index f1e720f0476c..a6f3313291e7 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -89,7 +89,7 @@ public String toString() {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
     Object value;
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
index f1e720f0476c..a6f3313291e7 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java
@@ -89,7 +89,7 @@ public String toString() {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
     Object value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
index f1e720f0476c..a6f3313291e7 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java
@@ -89,7 +89,7 @@ public String toString() {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
     Object value;
 
diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
index f1e720f0476c..a6f3313291e7 100644
--- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java
@@ -89,7 +89,7 @@ public String toString() {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
     Object value;
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
index 656a162aa4de..4c3728a3d099 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -36,7 +36,7 @@ public class EnumArrays  {
   
   public enum JustSymbolEnum {
 
-        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -72,7 +72,7 @@ public static JustSymbolEnum fromValue(String value) {
 
   public enum ArrayEnumEnum {
 
-        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index d5e487b03f1a..0d5e5b65d533 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -44,7 +44,7 @@ public class EnumTest  {
   
   public enum EnumStringEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -80,7 +80,7 @@ public static EnumStringEnum fromValue(String value) {
 
   public enum EnumStringRequiredEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -116,7 +116,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
 
   public enum EnumIntegerEnum {
 
-        NUMBER_1(1), NUMBER_MINUS_1(-1);
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -152,7 +152,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
 
   public enum EnumNumberEnum {
 
-        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
index 2d5f73b2788e..5adaa6bb314f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -41,7 +41,7 @@ public class MapTest  {
 
   public enum InnerEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
index e64574e3cf96..c9e2e6a179f0 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -57,7 +57,7 @@ public class Order  {
 
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -100,7 +100,7 @@ public static StatusEnum fromValue(String value) {
 
   public enum PaymentMethodEnum {
 
-        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
 
     BigDecimal value;
@@ -139,7 +139,7 @@ public static PaymentMethodEnum fromValue(BigDecimal value) {
 
   public enum OrderStatusEnum {
 
-        PENDING("PENDING"), PROCESSING("PROCESSING");
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
 
     Object value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index dc5fbc4723f2..657f266e6db5 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -45,7 +45,7 @@ public class ParentWithNullable  {
   
   public enum TypeEnum {
 
-        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
index 314ae1f21bee..f53d512ee9c2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
@@ -65,7 +65,7 @@ public class Pet  {
 
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
index 09d078772c50..06c78288e181 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Order.java
@@ -52,7 +52,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
index 0a5e28e9dc94..28dd90e2ebd4 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/src/main/java/org/openapitools/client/model/Pet.java
@@ -59,7 +59,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
index 230d8f22e3c4..2fffb41be6e0 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -39,7 +39,7 @@ public class EnumArrays  {
   @JsonbTypeDeserializer(JustSymbolEnum.Deserializer.class)
   public enum JustSymbolEnum {
 
-        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -84,7 +84,7 @@ public void serialize(JustSymbolEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(ArrayEnumEnum.Deserializer.class)
   public enum ArrayEnumEnum {
 
-        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
index 37869411929f..9ef4fff63284 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -40,7 +40,7 @@ public class EnumTest  {
   @JsonbTypeDeserializer(EnumStringEnum.Deserializer.class)
   public enum EnumStringEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -85,7 +85,7 @@ public void serialize(EnumStringEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(EnumStringRequiredEnum.Deserializer.class)
   public enum EnumStringRequiredEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -130,7 +130,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-        NUMBER_1(1), NUMBER_MINUS_1(-1);
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -175,7 +175,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
index b565fa373b58..a72e26d96327 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/MapTest.java
@@ -41,7 +41,7 @@ public class MapTest  {
   @JsonbTypeDeserializer(InnerEnum.Deserializer.class)
   public enum InnerEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
index 97f6f8626df2..5c65ddfdaf0e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
@@ -50,7 +50,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -101,7 +101,7 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
   public enum PaymentMethodEnum {
 
-        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
 
     BigDecimal value;
@@ -149,7 +149,7 @@ public void serialize(PaymentMethodEnum obj, JsonGenerator generator, Serializat
   @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class)
   public enum OrderStatusEnum {
 
-        PENDING("PENDING"), PROCESSING("PROCESSING");
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
 
     Object value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index d91e3d1551c1..5908510fdb9c 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -38,7 +38,7 @@ public class ParentWithNullable  {
   @JsonbTypeDeserializer(TypeEnum.Deserializer.class)
   public enum TypeEnum {
 
-        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
index 6a7f1c33a306..89186a67e942 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
@@ -58,7 +58,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
index fc178fc76a17..2ca6b66700ff 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Order.java
@@ -49,7 +49,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
index f8a23df6fef6..fc10762ad1d2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-mutiny/src/main/java/org/openapitools/client/model/Pet.java
@@ -56,7 +56,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index 09d078772c50..06c78288e181 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -52,7 +52,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
index 0a5e28e9dc94..28dd90e2ebd4 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
@@ -59,7 +59,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index b7c60ed5adbf..29267b36bf13 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -36,7 +36,7 @@ public class EnumArrays  {
   @JsonbTypeDeserializer(JustSymbolEnum.Deserializer.class)
   public enum JustSymbolEnum {
 
-        GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
 
 
     String value;
@@ -81,7 +81,7 @@ public void serialize(JustSymbolEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(ArrayEnumEnum.Deserializer.class)
   public enum ArrayEnumEnum {
 
-        FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
+    FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 75f4b7cca0af..7fe3260cc677 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -37,7 +37,7 @@ public class EnumTest  {
   @JsonbTypeDeserializer(EnumStringEnum.Deserializer.class)
   public enum EnumStringEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -82,7 +82,7 @@ public void serialize(EnumStringEnum obj, JsonGenerator generator, Serialization
   @JsonbTypeDeserializer(EnumStringRequiredEnum.Deserializer.class)
   public enum EnumStringRequiredEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
 
 
     String value;
@@ -127,7 +127,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria
   @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class)
   public enum EnumIntegerEnum {
 
-        NUMBER_1(1), NUMBER_MINUS_1(-1);
+    NUMBER_1(1), NUMBER_MINUS_1(-1);
 
 
     Integer value;
@@ -172,7 +172,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio
   @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class)
   public enum EnumNumberEnum {
 
-        NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
+    NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
 
 
     Double value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
index ae86af68b3e0..e6977a0567d5 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -38,7 +38,7 @@ public class MapTest  {
   @JsonbTypeDeserializer(InnerEnum.Deserializer.class)
   public enum InnerEnum {
 
-        UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
+    UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index d7e39bc19396..b35106f28290 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -47,7 +47,7 @@ public class Order  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
@@ -98,7 +98,7 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class)
   public enum PaymentMethodEnum {
 
-        NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
+    NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2"));
 
 
     BigDecimal value;
@@ -146,7 +146,7 @@ public void serialize(PaymentMethodEnum obj, JsonGenerator generator, Serializat
   @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class)
   public enum OrderStatusEnum {
 
-        PENDING("PENDING"), PROCESSING("PROCESSING");
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
 
     Object value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 164526d5a6ab..f26bca67bcce 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -33,7 +33,7 @@ public class ParentWithNullable  {
   @JsonbTypeDeserializer(TypeEnum.Deserializer.class)
   public enum TypeEnum {
 
-        CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
 
     String value;
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
index 9e0f59b20628..826495b93453 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -55,7 +55,7 @@ public class Pet  {
   @JsonbTypeDeserializer(StatusEnum.Deserializer.class)
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
index c3dbfcccb3fb..a6d99b32bb0e 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -143,7 +143,7 @@ public static PaymentMethodEnum fromValue(BigDecimal value) {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
 
     private Object value;
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
index c3dbfcccb3fb..a6d99b32bb0e 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java
@@ -143,7 +143,7 @@ public static PaymentMethodEnum fromValue(BigDecimal value) {
 
 public enum OrderStatusEnum {
 
-    PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
+    PENDING("PENDING"), PROCESSING("PROCESSING");
 
 
     private Object value;
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
index a2f20041f9f6..31031beb5379 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
@@ -55,7 +55,7 @@ public class Order  {
 
   public enum StatusEnum {
 
-        PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
 
 
     String value;
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
index d73e4ee930a5..d1e447e3d9cd 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
@@ -63,7 +63,7 @@ public class Pet  {
 
   public enum StatusEnum {
 
-        AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
 
 
     String value;