diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache index 6db13f884a38..544448a11ab8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache @@ -12,6 +12,9 @@ import com.google.gson.stream.JsonWriter; {{#isUri}} import java.net.URI; {{/isUri}} +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -39,8 +42,19 @@ import java.net.URI; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -61,10 +75,9 @@ import java.net.URI; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; } {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache index a89b1578d7bd..1ecf3349598b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache @@ -2,6 +2,9 @@ import java.io.IOException; {{#isUri}} import java.net.URI; {{/isUri}} +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -28,8 +31,19 @@ import com.google.gson.stream.JsonWriter; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -44,10 +58,9 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; } {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 6738ef9edc16..194dc38fe35b 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -12,6 +12,9 @@ import com.google.gson.stream.JsonWriter; {{#isUri}} import java.net.URI; {{/isUri}} +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -39,8 +42,19 @@ import java.net.URI; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -61,10 +75,9 @@ import java.net.URI; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; } {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index fa618e9d5ce9..07c55ed83d98 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -2,6 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; {{/jackson}} +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -22,8 +25,19 @@ import com.fasterxml.jackson.annotation.JsonValue; {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} {{/gson}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -43,12 +57,11 @@ import com.fasterxml.jackson.annotation.JsonValue; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}} + {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } {{/jackson}} } diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache index dc66e6ccc74b..3d6825e92b4b 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache @@ -1,3 +1,7 @@ +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; + /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ @@ -28,8 +32,19 @@ {{/enumVars}} {{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -46,12 +61,11 @@ {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals(value)) { - return b; - } - } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}} + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; + } + {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } {{#jsonb}} public static final class Deserializer implements JsonbDeserializer<{{datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache index 8b2c6a5a4da0..14763906fd81 100644 --- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache @@ -2,6 +2,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; {{/jackson}} +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; +import java.util.Map; /** * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} @@ -27,8 +30,19 @@ import com.fasterxml.jackson.annotation.JsonValue; {{/enumVars}} {{/allowableValues}} + private static final Map<{{{dataType}}}, {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> cacheByValue = new HashMap<>(); + private {{{dataType}}} value; + static { + for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -49,16 +63,10 @@ import com.fasterxml.jackson.annotation.JsonValue; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}} - return null; - {{/isNullable}} - {{^isNullable}} - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - {{/isNullable}} + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}cacheByValue.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + if (result != null) { + return result; + } + {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 94a0a6f4535e..5b36f686bb10 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -2373,9 +2373,9 @@ public void testEnumCaseInsensitive_issue8084() { Map files = new DefaultGenerator().opts(new ClientOptInput().openAPI(openAPI).config(codegen)) .generate().stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("EnumTest.java")) - .assertMethod("fromValue") - .bodyContainsLines("if (b.value.equalsIgnoreCase(value)) {"); + assertThat(files.get("EnumTest.java")) + .content() + .contains("toLowerCase(Locale.ROOT)"); } @Test @@ -2389,9 +2389,9 @@ public void testEnumCaseSensitive_issue8084() { Map files = new DefaultGenerator().opts(new ClientOptInput().openAPI(openAPI).config(codegen)) .generate().stream().collect(Collectors.toMap(File::getName, Function.identity())); - JavaFileAssert.assertThat(files.get("EnumTest.java")) - .assertMethod("fromValue") - .bodyContainsLines("if (b.value.equals(value)) {"); + assertThat(files.get("EnumTest.java")) + .content() + .contains("new HashMap<>()"); } @Test diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/StringEnumRef.java index 5ca8572a26cc..edd06cdfbc4c 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -35,8 +37,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java index f83be8ae238d..73f9263e8857 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -35,8 +37,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/StringEnumRef.java index fa7406f11f87..022ad5c424e8 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -36,8 +38,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java index c786ac6c8423..1e5b991cd2c8 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/StringEnumRef.java index 58aa5118509c..2a9715ffade9 100644 --- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -33,8 +35,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java index 6e706b20d44c..1add1d0621d3 100644 --- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -32,8 +34,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/StringEnumRef.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/StringEnumRef.java index 58aa5118509c..2a9715ffade9 100644 --- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/StringEnumRef.java +++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/StringEnumRef.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets StringEnumRef @@ -33,8 +35,19 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + StringEnumRef(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } + StringEnumRef result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION index 193a12d6e891..0610c66bc14f 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/.openapi-generator/VERSION @@ -1 +1 @@ -7.20.0-SNAPSHOT +7.21.0-SNAPSHOT diff --git a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md index 91065665a8c5..4f312e8b570b 100644 --- a/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md +++ b/samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/README.md @@ -7,7 +7,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat - API version: 1.0.0 - Package version: -- Generator version: 7.20.0-SNAPSHOT +- Generator version: 7.21.0-SNAPSHOT - Build package: org.openapitools.codegen.languages.KotlinClientCodegen ## Requires diff --git a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataChannel.java b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataChannel.java index de8fd1f67749..7a1b722f3d55 100644 --- a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataChannel.java +++ b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataChannel.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * The transport-channel @@ -35,8 +37,19 @@ public enum DataChannel { PLANE("PLANE"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (DataChannel e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + DataChannel(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static DataChannel fromValue(String value) { - for (DataChannel b : DataChannel.values()) { - if (b.value.equals(value)) { - return b; - } + DataChannel result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataDirection.java b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataDirection.java index 93cd97f0555c..d78234ffa8f9 100644 --- a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataDirection.java +++ b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataDirection.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * The direction a message travels @@ -31,8 +33,19 @@ public enum DataDirection { OUTGOING("OUTGOING"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (DataDirection e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + DataDirection(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static DataDirection fromValue(String value) { - for (DataDirection b : DataDirection.values()) { - if (b.value.equals(value)) { - return b; - } + DataDirection result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java index 494d8c68ad3f..1ce6fdfbb475 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets FruitType @@ -30,8 +32,19 @@ public enum FruitType { BANANA("BANANA"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (FruitType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + FruitType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - for (FruitType b : FruitType.values()) { - if (b.value.equals(value)) { - return b; - } + FruitType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/model/FruitType.java b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/model/FruitType.java index 494d8c68ad3f..1ce6fdfbb475 100644 --- a/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/model/FruitType.java +++ b/samples/client/others/java/webclient-sealedInterface_3_1/src/main/java/org/openapitools/client/model/FruitType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets FruitType @@ -30,8 +32,19 @@ public enum FruitType { BANANA("BANANA"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (FruitType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + FruitType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - for (FruitType b : FruitType.values()) { - if (b.value.equals(value)) { - return b; - } + FruitType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java index f01bfc417554..61a124c92eb3 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumClass.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _EFG("-efg"), _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } } diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java index 5cf96d109321..049bf70a23f5 100644 --- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java +++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterEnum.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { APPROVED("approved"), DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumClass.java index 285d9d10081a..25c8c4746376 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumClass.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnum.java index 615c2ec90421..98fec3434ba1 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index cff8d4d5b9a7..f1dd8242a557 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -35,8 +37,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index c28f8f4c0118..e76aea6cdc98 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -35,8 +37,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 46c40fb9b272..c180d68f1f25 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -35,8 +37,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SingleRefType.java index d44513c04bd9..bdc1c9465a33 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -33,8 +35,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java index 111927ab55fe..4b1a461da80d 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -34,8 +36,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java index 925066b50704..5495748fdbd8 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -34,8 +36,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterEnum.java index d2924eb9c29b..46e0137afa4a 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumClass.java index 0150ebe31b41..ec49d999a4b1 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -34,8 +36,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterEnum.java index 109481afd6cf..152b25ce92b2 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -34,8 +36,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java index 0150ebe31b41..ec49d999a4b1 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -34,8 +36,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java index 109481afd6cf..152b25ce92b2 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -34,8 +36,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java index a8d97ff8d03d..905fe2afdd7b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumClass.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -38,8 +40,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java index ff6b4dff8e97..dfb47c60c069 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -38,8 +40,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 55e81d230056..e405bad1611b 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -38,8 +40,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 55c38bd319f2..2eaef9914f77 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -38,8 +40,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index b6156de0ce6a..652ba29fc222 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -38,8 +40,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java index 61bf307c7ea3..37016011dffd 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumClass.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -36,8 +38,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java index c21adecfcf66..3cae90b4240a 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -36,8 +38,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index c7eb56f321d6..a1e141a31474 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -36,8 +38,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 18931ecf4307..c96b138191e6 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -36,8 +38,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index c617412a4d2f..ff34edd2a34e 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -36,8 +38,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java index fe2eb0dfea77..c034be45b967 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -38,8 +40,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java index ec55a4f7e73e..563b021ab821 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -38,8 +40,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 3f15ec369add..649ee2f47f44 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -38,8 +40,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index d8d14a080c24..0c4350cf0908 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -38,8 +40,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 4ed2d786f084..f923a2891dff 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -26,6 +26,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -38,8 +40,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -56,10 +69,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java index 84ac24f392db..855a5caea897 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CodesEnum.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum CodesEnum { CODE_3("Code 3"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (CodesEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + CodesEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static CodesEnum fromValue(String value) { - for (CodesEnum b : CodesEnum.values()) { - if (b.value.equals(value)) { - return b; - } + CodesEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumClass.java index c2dfd3aecd7c..74f354cc1901 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumClass.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterEnum.java index 7f2bd742d75e..9442df1460cd 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumClass.java index 5668c62bebe2..6c037db19ac1 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumClass.java @@ -19,6 +19,8 @@ import android.os.Parcel; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -37,8 +39,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterEnum.java index f9002dca2ded..29cad18a84a9 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -19,6 +19,8 @@ import android.os.Parcel; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -37,8 +39,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumClass.java index c2dfd3aecd7c..74f354cc1901 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumClass.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableEnum.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableEnum.java index d28af0a9d1ea..9e57f2f86142 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableEnum.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableEnum.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -31,8 +33,19 @@ public enum NullableEnum { CUSTOM("custom"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (NullableEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + NullableEnum(String value) { this.value = value; } @@ -47,10 +60,9 @@ public String toString() { } public static NullableEnum fromValue(String value) { - for (NullableEnum b : NullableEnum.values()) { - if (b.value.equals(value)) { - return b; - } + NullableEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnum.java index 849bfbf89285..4927ee62ce67 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -39,8 +41,19 @@ public enum OuterEnum { UPPER_CASE_S("S"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -55,10 +68,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 09897c14f170..efaf87c26767 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index baab420fb37b..d017b7daf45c 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -36,8 +38,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { } public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 8d5372492bed..dc519ce1e181 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -17,6 +17,8 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +37,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java index 43ec2faf20c8..a4ac531db786 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumClass.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java index 386290bc6528..7fd04f40d9e4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -53,10 +66,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java index ae6366ff6196..aebb4940a597 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumClass.java @@ -25,6 +25,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -38,8 +40,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java index be690856408e..13f4dcf1abb8 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -25,6 +25,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -38,8 +40,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..8c2a9e967bf2 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + private static final long serialVersionUID = 1L; + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..8af8dcbe46d2 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,39 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.Module.SetupContext; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + private static final long serialVersionUID = 1L; + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + } + + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } + +} diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java index 95093ab9f256..4695ef270ca4 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java index 19423e46e26b..4ba0f8e262f1 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 0ea8bf45d558..1efde214a78f 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 22eed4ead4a4..b61409d3a73f 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 9ccd0ced1b26..eb0bd6e71504 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java index eb511fd5209b..c26beda82b18 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumClass.java index 95093ab9f256..4695ef270ca4 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnum.java index 19423e46e26b..4ba0f8e262f1 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 0ea8bf45d558..1efde214a78f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 22eed4ead4a4..b61409d3a73f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 9ccd0ced1b26..eb0bd6e71504 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/SingleRefType.java index eb511fd5209b..c26beda82b18 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java index 95093ab9f256..4695ef270ca4 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java index 19423e46e26b..4ba0f8e262f1 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 0ea8bf45d558..1efde214a78f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 22eed4ead4a4..b61409d3a73f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 9ccd0ced1b26..eb0bd6e71504 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java index eb511fd5209b..c26beda82b18 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumClass.java index 95093ab9f256..4695ef270ca4 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnum.java index 19423e46e26b..4ba0f8e262f1 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 0ea8bf45d558..1efde214a78f 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 22eed4ead4a4..b61409d3a73f 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 9ccd0ced1b26..eb0bd6e71504 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SingleRefType.java index eb511fd5209b..c26beda82b18 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..8c2a9e967bf2 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + private static final long serialVersionUID = 1L; + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..8af8dcbe46d2 --- /dev/null +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,39 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.Module.SetupContext; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + private static final long serialVersionUID = 1L; + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + } + + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } + +} diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumClass.java index 699f8e61153b..7f878efc7b14 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumClass.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -40,8 +42,19 @@ public enum EnumClass { @XmlEnumValue("(xyz)") _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -58,10 +71,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnum.java index 246dfa9e334d..b3059712764d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -40,8 +42,19 @@ public enum OuterEnum { @XmlEnumValue("delivered") DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -58,10 +71,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 9679bbefc077..4aeca2f79707 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -40,8 +42,19 @@ public enum OuterEnumDefaultValue { @XmlEnumValue("delivered") DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -58,10 +71,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index f133b484d0a0..bbaeb80faa31 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -40,8 +42,19 @@ public enum OuterEnumInteger { @XmlEnumValue("2") NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -58,10 +71,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index e274e3679b57..fbb82ac90943 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -40,8 +42,19 @@ public enum OuterEnumIntegerDefaultValue { @XmlEnumValue("2") NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -58,10 +71,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SingleRefType.java index f25928b94a98..f474a5493b75 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -37,8 +39,19 @@ public enum SingleRefType { @XmlEnumValue("user") USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -55,10 +68,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumClass.java index 95093ab9f256..4695ef270ca4 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnum.java index 19423e46e26b..4ba0f8e262f1 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 0ea8bf45d558..1efde214a78f 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index 22eed4ead4a4..b61409d3a73f 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 9ccd0ced1b26..eb0bd6e71504 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SingleRefType.java index eb511fd5209b..c26beda82b18 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java index 2338be6dabed..c68d15321052 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -34,8 +36,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java index 37762ab1d6c7..a043f76044ef 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -34,8 +36,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java index b9a78241a5a7..93d44c118d89 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java index bd870812102c..896e74d0c1a7 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java index b9a78241a5a7..93d44c118d89 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java index bd870812102c..896e74d0c1a7 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java index b9a78241a5a7..93d44c118d89 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumClass.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -35,8 +37,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java index bd870812102c..896e74d0c1a7 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -35,8 +37,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java index d2924eb9c29b..46e0137afa4a 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..5a5edd0fadcf --- /dev/null +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + private static final long serialVersionUID = 1L; + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..29a588acbe6e --- /dev/null +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,39 @@ +/* + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * 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; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.Module.SetupContext; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + private static final long serialVersionUID = 1L; + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + } + + @Override + public void setupModule(SetupContext context) { + super.setupModule(context); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } + +} diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumClass.java index 1190cf5abe3c..becfc70956ab 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumClass.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -32,8 +34,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnum.java index 4cd955b63dc3..e67f97286eaa 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -32,8 +34,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 73077cc8c31c..05e3738d8685 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index e6c2e38c2e7c..9cdc866032ae 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -32,8 +34,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index ef61373b187f..d2f2c836428f 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +34,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,10 +63,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SingleRefType.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SingleRefType.java index f99224547559..7f0855ee865e 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SingleRefType.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SingleRefType.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -30,8 +32,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -48,10 +61,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java index 4f09e72dbe2c..2148f9780fc3 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -36,8 +38,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java index 608bb2c96897..fe1087519440 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -36,8 +38,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java index 25b3940b7490..6db7238c2738 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -36,8 +38,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java index c3072f8a0ae4..4aee17485d54 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -36,8 +38,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java index 0d894f96178d..98caf49a3180 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -36,8 +38,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -54,10 +67,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java index 02ab14690502..79452e09631c 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java index 77211c01320f..573ba3cb1385 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java index 60a075514903..906a163e6183 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApiController.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApiController.java index c6d5a1006a1f..eb3a852b4bdc 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApiController.java @@ -28,7 +28,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApiController.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApiController.java index 1b0f90b47a64..dcafdbcb4158 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApiController.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApiController.java index e9678d548047..d6ab21b678b9 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import jakarta.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java index 3aac98ef17d2..0429c5f93cfc 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -34,8 +36,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java index e89abf334221..8ce228fce9de 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterEnum.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -34,8 +36,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -52,10 +65,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java index c9e85144ad11..76ade7355043 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java index 2b86eb9957c4..5c0c479a9513 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java index 4b216b220ae8..42026e8b69a2 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java index fb39156bca9f..ee8679e5e071 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java index 53764f30d0d2..44b3dea6963c 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SingleRefType.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SingleRefType.java index 29d6b053312f..317d42d2a371 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SingleRefType.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java index c9e85144ad11..76ade7355043 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java index 7caf1a1ea1c2..25873ed4e7b1 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java index c9e85144ad11..76ade7355043 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java index 7caf1a1ea1c2..25873ed4e7b1 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumClass.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumClass.java index 634563024395..036d4461187d 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumClass.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/EnumClass.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets EnumClass @@ -33,8 +35,19 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + EnumClass(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } + EnumClass result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnum.java index ae10ef178017..0f78c78ce45e 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnum.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnum.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnum @@ -33,8 +35,19 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnum(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnum result = cacheByValue.get(value); + if (result != null) { + return result; } return null; } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java index e4597c9e0aa0..9196676a820d 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumInteger.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumInteger.java index b851c03c7163..9b90f6a2db31 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumInteger.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumInteger.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumInteger @@ -33,8 +35,19 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumInteger result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java index c5779d36babe..2b1f683dc4f7 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +35,19 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map cacheByValue = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + Integer key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,10 +64,9 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/SingleRefType.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/SingleRefType.java index 342af7c5cf77..50dc45242a6a 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/SingleRefType.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/SingleRefType.java @@ -21,6 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; /** * Gets or Sets SingleRefType @@ -31,8 +33,19 @@ public enum SingleRefType { USER("user"); + private static final Map cacheByValue = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + String key = e.value; + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); + } + } + } + SingleRefType(String value) { this.value = value; } @@ -49,10 +62,9 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } + SingleRefType result = cacheByValue.get(value); + if (result != null) { + return result; } throw new IllegalArgumentException("Unexpected value '" + value + "'"); } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApiController.java index da05b5e3d440..e7f4cc727f43 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApiController.java index bc52ebc8e490..3dccd4c254fe 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApiController.java @@ -39,7 +39,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 68835b4b9f8f..eb6b72c75682 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java index 27650fb63af7..5b8a4056a0e6 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java index 14845d6df819..e940fcf5ccfe 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java index 28e6350ea157..743d5ba92de5 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/AnotherFakeApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/AnotherFakeApiController.java index da05b5e3d440..e7f4cc727f43 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/AnotherFakeApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/AnotherFakeApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class AnotherFakeApiController implements AnotherFakeApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApiController.java index 6b578ef556e3..0469bea91477 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApiController.java @@ -43,7 +43,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeApiController implements FakeApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java index 68835b4b9f8f..eb6b72c75682 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeClassnameTestApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FakeClassnameTestApiController implements FakeClassnameTestApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FooApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FooApiController.java index 038f6ee5cc6c..1f84b7fa221a 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FooApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FooApiController.java @@ -26,7 +26,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class FooApiController implements FooApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApiController.java index 27650fb63af7..5b8a4056a0e6 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApiController.java @@ -29,7 +29,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class PetApiController implements PetApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApiController.java index 14845d6df819..e940fcf5ccfe 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class StoreApiController implements StoreApi { diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApiController.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApiController.java index 28e6350ea157..743d5ba92de5 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApiController.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApiController.java @@ -27,7 +27,7 @@ import java.util.Optional; import javax.annotation.Generated; -@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.20.0-SNAPSHOT") +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.21.0-SNAPSHOT") @Controller @RequestMapping("${openapi.openAPIPetstore.base-path:/v2}") public class UserApiController implements UserApi {