apply to more libraries, improve test

Author: martin-mfg

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}}
 

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}}

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

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:

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:

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
 

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;
 

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;
 

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;
 

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;