improve java enums (#19815)

OpenAPITools · Oct 9, 2024 · d60200d · d60200d
1 parent 22b8c47
commit d60200d
Show file tree

Hide file tree

Showing 193 changed files with 761 additions and 761 deletions.
diff --git 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}}}({{{value}}}){{^-last}},
+    {{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
     {{/-last}}{{#-last}};{{/-last}}
       {{/enumVars}}
     {{/allowableValues}}

diff --git a/..._api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/..._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;
 

diff --git a/...ient/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/...ient/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;
 

diff --git a/...nt/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java b/...nt/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;
 

diff --git a/...nt/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/...nt/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;
 

diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/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;
 

diff --git a/...es/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java b/...es/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;
 

diff --git a/...client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java b/...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;
 

diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java b/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;
 

diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java b/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;
 

diff --git a/...nt/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/...nt/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -53,11 +53,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;
 

diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -60,11 +60,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;
 

diff --git a/...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java b/...es/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java
@@ -42,11 +42,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;
 

diff --git a/...ient/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java b/...ient/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -53,11 +53,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;
 

diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -60,11 +60,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;
 

diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java
@@ -42,11 +42,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;
 

diff --git a/.../echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java b/.../echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -53,11 +53,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;
 

diff --git a/...es/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/...es/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -60,11 +60,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;
 

diff --git a/.../client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java b/.../client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java
@@ -42,11 +42,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;
 

diff --git a/...tstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/...tstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -42,9 +42,9 @@ public class EnumArrays {
    * Gets or Sets justSymbol
    */
   public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
+    GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
 
-    DOLLAR("$");
+    DOLLAR(String.valueOf("$"));
 
     private String value;
 
@@ -80,9 +80,9 @@ public static JustSymbolEnum fromValue(String value) {
    * Gets or Sets arrayEnum
    */
   public enum ArrayEnumEnum {
-    FISH("fish"),
+    FISH(String.valueOf("fish")),
 
-    CRAB("crab");
+    CRAB(String.valueOf("crab"));
 
     private String value;
 

diff --git a/...petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java b/...petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -54,11 +54,11 @@ public class EnumTest {
    * Gets or Sets enumString
    */
   public enum EnumStringEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
 
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
 
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -94,11 +94,11 @@ public static EnumStringEnum fromValue(String value) {
    * Gets or Sets enumStringRequired
    */
   public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
 
-    LOWER("lower"),
+    LOWER(String.valueOf("lower")),
 
-    EMPTY("");
+    EMPTY(String.valueOf(""));
 
     private String value;
 
@@ -134,9 +134,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
    * Gets or Sets enumInteger
    */
   public enum EnumIntegerEnum {
-    NUMBER_1(1),
+    NUMBER_1(Integer.valueOf(1)),
 
-    NUMBER_MINUS_1(-1);
+    NUMBER_MINUS_1(Integer.valueOf(-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(1.1),
+    NUMBER_1_DOT_1(Double.valueOf(1.1)),
 
-    NUMBER_MINUS_1_DOT_2(-1.2);
+    NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
 
     private Double value;
 

diff --git a/.../petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java b/.../petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -46,9 +46,9 @@ public class MapTest {
    * Gets or Sets inner
    */
   public enum InnerEnum {
-    UPPER("UPPER"),
+    UPPER(String.valueOf("UPPER")),
 
-    LOWER("lower");
+    LOWER(String.valueOf("lower"));
 
     private String value;
 

diff --git a/...nt/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/...nt/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
@@ -56,11 +56,11 @@ public class Order {
    * Order Status
    */
   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/...ava/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/...ava/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -55,7 +55,7 @@ public class ParentWithNullable {
    * Gets or Sets type
    */
   public enum TypeEnum {
-    CHILD_WITH_NULLABLE("ChildWithNullable");
+    CHILD_WITH_NULLABLE(String.valueOf("ChildWithNullable"));
 
     private String value;