improve java enums (#19815)

Author: martin-mfg

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}}}({{{value}}}){{^-last}},
+    {{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java

@@ -56,11 +56,11 @@ public class DefaultValue {
    * Gets or Sets arrayStringEnumDefault
    */
   public enum ArrayStringEnumDefaultEnum {
-    SUCCESS("success"),
+    SUCCESS(String.valueOf("success")),
 
-    FAILURE("failure"),
+    FAILURE(String.valueOf("failure")),
 
-    UNCLASSIFIED("unclassified");
+    UNCLASSIFIED(String.valueOf("unclassified"));
 
     private String value;
 

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java

@@ -63,11 +63,11 @@ public class Pet {
    * pet status in the store
    */
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
 
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
 
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java

@@ -45,11 +45,11 @@ public class Query {
    * Gets or Sets outcomes
    */
   public enum OutcomesEnum {
-    SUCCESS("SUCCESS"),
+    SUCCESS(String.valueOf("SUCCESS")),
 
-    FAILURE("FAILURE"),
+    FAILURE(String.valueOf("FAILURE")),
 
-    SKIPPED("SKIPPED");
+    SKIPPED(String.valueOf("SKIPPED"));
 
     private String value;
 

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java

@@ -41,11 +41,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;
 

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java

@@ -57,11 +57,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;
 

samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java

@@ -39,11 +39,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;
 

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java

@@ -58,11 +58,11 @@ public class DefaultValue {
    * Gets or Sets arrayStringEnumDefault
    */
   public enum ArrayStringEnumDefaultEnum {
-    SUCCESS("success"),
+    SUCCESS(String.valueOf("success")),
 
-    FAILURE("failure"),
+    FAILURE(String.valueOf("failure")),
 
-    UNCLASSIFIED("unclassified");
+    UNCLASSIFIED(String.valueOf("unclassified"));
 
     private String value;
 

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java

@@ -65,11 +65,11 @@ public class Pet {
    * pet status in the store
    */
   public enum StatusEnum {
-    AVAILABLE("available"),
+    AVAILABLE(String.valueOf("available")),
 
-    PENDING("pending"),
+    PENDING(String.valueOf("pending")),
 
-    SOLD("sold");
+    SOLD(String.valueOf("sold"));
 
     private String value;
 

samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java

@@ -47,11 +47,11 @@ public class Query {
    * Gets or Sets outcomes
    */
   public enum OutcomesEnum {
-    SUCCESS("SUCCESS"),
+    SUCCESS(String.valueOf("SUCCESS")),
 
-    FAILURE("FAILURE"),
+    FAILURE(String.valueOf("FAILURE")),
 
-    SKIPPED("SKIPPED");
+    SKIPPED(String.valueOf("SKIPPED"));
 
     private String value;