From 4a113260157938f08beda9f29588fc29554821e2 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Mon, 16 Feb 2026 22:03:40 +0100 Subject: [PATCH 01/19] feat: add modelEnum static mappers --- .../Java/libraries/native/modelEnum.mustache | 18 ++++++++----- .../libraries/okhttp-gson/modelEnum.mustache | 20 +++++++++------ .../main/resources/Java/modelEnum.mustache | 18 ++++++++----- .../resources/JavaJaxRS/modelEnum.mustache | 18 ++++++++----- .../server/libraries/mp/modelEnum.mustache | 19 +++++++++----- .../common/model/modelEnum.mustache | 25 ++++++++++--------- 6 files changed, 75 insertions(+), 43 deletions(-) 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 ca351e0039cb..8342da1ad803 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -39,8 +42,16 @@ import java.net.URI; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -61,12 +72,7 @@ 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.{{^isString}}equals{{/isString}}{{#isString}}{{#useEnumCaseInsensitive}}equalsIgnoreCase{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}equals{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#supportUrlQuery}} 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 605f4f6a2ef4..b118b0853f3a 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -28,8 +31,16 @@ import com.google.gson.stream.JsonWriter; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -42,14 +53,9 @@ import com.google.gson.stream.JsonWriter; public String toString() { return String.valueOf(value); } - +// public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) { - if (b.value.{{^isString}}equals{{/isString}}{{#isString}}{{#useEnumCaseInsensitive}}equalsIgnoreCase{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}equals{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 3b54fddc1b13..1c0add9c23c7 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -39,8 +42,16 @@ import java.net.URI; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -61,12 +72,7 @@ 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.{{^isString}}equals{{/isString}}{{#isString}}{{#useEnumCaseInsensitive}}equalsIgnoreCase{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}equals{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#gson}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 2e497f21d477..37acac6f9176 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -22,8 +25,16 @@ import com.fasterxml.jackson.annotation.JsonValue; {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} {{/gson}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -43,12 +54,7 @@ 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.{{^isString}}equals{{/isString}}{{#isString}}{{#useEnumCaseInsensitive}}equalsIgnoreCase{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}equals{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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..f2ccb2a08827 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; + /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} */ @@ -28,8 +32,16 @@ {{/enumVars}} {{/allowableValues}} + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -46,12 +58,7 @@ {{#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}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 e81b044e97d7..3b484a051014 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.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +import java.util.Map; +import java.util.Optional; /** * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} @@ -27,8 +30,16 @@ import com.fasterxml.jackson.annotation.JsonValue; {{/enumVars}} {{/allowableValues}} + private static final Map<{{{dataType}}}, {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private {{{dataType}}} value; + static { + for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { + BY_VALUE.put(e.value, e); + } + } + {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}({{{dataType}}} value) { this.value = value; } @@ -44,21 +55,11 @@ import com.fasterxml.jackson.annotation.JsonValue; public String toString() { return String.valueOf(value); } - +// {{#jackson}} @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.{{^isString}}equals{{/isString}}{{#isString}}{{#useEnumCaseInsensitive}}equalsIgnoreCase{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}equals{{/useEnumCaseInsensitive}}{{/isString}}(value)) { - return b; - } - } - {{#isNullable}} - return null; - {{/isNullable}} - {{^isNullable}} - throw new IllegalArgumentException("Unexpected value '" + value + "'"); - {{/isNullable}} + return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } } From 638b2305a06e2848357b463402b4f9f0fc23c6a6 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Mon, 16 Feb 2026 22:04:15 +0100 Subject: [PATCH 02/19] test: update case sensitivity tests --- .../codegen/java/JavaClientCodegenTest.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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..0ef77e758562 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 @@ -71,6 +71,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.openapitools.codegen.CodegenConstants.*; import static org.openapitools.codegen.TestUtils.*; +import static org.openapitools.codegen.languages.AbstractJavaCodegen.DISABLE_DISCRIMINATOR_JSON_IGNORE_PROPERTIES; +import static org.openapitools.codegen.languages.AbstractJavaCodegen.OPENAPI_NULLABLE; +import static org.openapitools.codegen.languages.AbstractJavaCodegen.USE_ONE_OF_INTERFACES; import static org.openapitools.codegen.languages.JavaClientCodegen.*; import static org.testng.Assert.*; @@ -2373,9 +2376,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("new TreeMap<>(String.CASE_INSENSITIVE_ORDER)"); } @Test @@ -2389,9 +2392,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 From f8df6d3ebca978e0db2784349eb89d3df64ddd66 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Mon, 16 Feb 2026 22:04:30 +0100 Subject: [PATCH 03/19] chore: regenerate samples --- .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/StringEnumRef.java | 20 ++++++++++++------- .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/StringEnumRef.java | 18 +++++++++++------ .../client/model/DataChannel.java | 18 +++++++++++------ .../client/model/DataDirection.java | 18 +++++++++++------ .../openapitools/client/model/FruitType.java | 18 +++++++++++------ .../openapitools/client/model/FruitType.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 20 ++++++++++++------- .../org/openapitools/model/OuterEnum.java | 20 ++++++++++++------- .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../openapitools/client/model/CodesEnum.java | 20 ++++++++++++------- .../openapitools/client/model/EnumClass.java | 20 ++++++++++++------- .../openapitools/client/model/OuterEnum.java | 20 ++++++++++++------- .../openapitools/client/model/EnumClass.java | 20 ++++++++++++------- .../openapitools/client/model/OuterEnum.java | 20 ++++++++++++------- .../openapitools/client/model/EnumClass.java | 20 ++++++++++++------- .../client/model/NullableEnum.java | 20 ++++++++++++------- .../openapitools/client/model/OuterEnum.java | 20 ++++++++++++------- .../client/model/OuterEnumDefaultValue.java | 20 ++++++++++++------- .../client/model/OuterEnumInteger.java | 20 ++++++++++++------- .../model/OuterEnumIntegerDefaultValue.java | 20 ++++++++++++------- .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../client/model/SingleRefType.java | 18 +++++++++++------ .../openapitools/client/model/EnumClass.java | 18 +++++++++++------ .../openapitools/client/model/OuterEnum.java | 18 +++++++++++------ .../client/model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../client/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 18 +++++++++++------ .../org/openapitools/model/OuterEnum.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 18 +++++++++++------ .../org/openapitools/model/OuterEnum.java | 18 +++++++++++------ .../model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../openapitools/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../org/openapitools/model/SingleRefType.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 18 +++++++++++------ .../org/openapitools/model/OuterEnum.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 18 +++++++++++------ .../org/openapitools/model/OuterEnum.java | 18 +++++++++++------ .../org/openapitools/model/EnumClass.java | 18 +++++++++++------ .../org/openapitools/model/OuterEnum.java | 18 +++++++++++------ .../model/OuterEnumDefaultValue.java | 18 +++++++++++------ .../openapitools/model/OuterEnumInteger.java | 18 +++++++++++------ .../model/OuterEnumIntegerDefaultValue.java | 18 +++++++++++------ .../org/openapitools/model/SingleRefType.java | 18 +++++++++++------ 180 files changed, 2174 insertions(+), 1094 deletions(-) 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..5f90bb977c8f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -35,8 +38,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -53,12 +64,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..42c7c5a527e3 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -35,8 +38,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..dd1f7e639c04 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -36,8 +39,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..95a4bebd3bff 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 6e706b20d44c..dd9bf3a4b8ae 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -32,8 +35,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..dd9bf3a4b8ae 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -32,8 +35,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 6e706b20d44c..dd9bf3a4b8ae 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -32,8 +35,16 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (StringEnumRef e: values()) { + BY_VALUE.put(e.value, e); + } + } + StringEnumRef(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - for (StringEnumRef b : StringEnumRef.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 37b33834a616..597b0e9216e9 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * The transport-channel @@ -34,8 +37,16 @@ public enum DataChannel { PLANE("PLANE"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (DataChannel e: values()) { + BY_VALUE.put(e.value, e); + } + } + DataChannel(String value) { this.value = value; } @@ -52,12 +63,7 @@ public String toString() { @JsonCreator public static DataChannel fromValue(String value) { - for (DataChannel b : DataChannel.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 817cdbf3a07f..1facade30e28 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * The direction a message travels @@ -30,8 +33,16 @@ public enum DataDirection { OUTGOING("OUTGOING"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (DataDirection e: values()) { + BY_VALUE.put(e.value, e); + } + } + DataDirection(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static DataDirection fromValue(String value) { - for (DataDirection b : DataDirection.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..1d0be4ff763d 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets FruitType @@ -30,8 +33,16 @@ public enum FruitType { BANANA("BANANA"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (FruitType e: values()) { + BY_VALUE.put(e.value, e); + } + } + FruitType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - for (FruitType b : FruitType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..1d0be4ff763d 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets FruitType @@ -30,8 +33,16 @@ public enum FruitType { BANANA("BANANA"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (FruitType e: values()) { + BY_VALUE.put(e.value, e); + } + } + FruitType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - for (FruitType b : FruitType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..daba41d09ed4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -33,8 +36,16 @@ public enum EnumClass { _EFG("-efg"), _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -48,15 +59,10 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// @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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..b04c43c68320 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -33,8 +36,16 @@ public enum OuterEnum { APPROVED("approved"), DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -48,15 +59,10 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// @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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..18a77e1f23e1 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -53,12 +64,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..4c7891e172d0 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -53,12 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..2577699deea1 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -35,8 +38,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -53,12 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..7c1a728b3115 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -35,8 +38,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -53,12 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..476b2a579b5e 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -35,8 +38,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -53,12 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..90ca2b48890b 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -33,8 +36,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f7cf9c014f4a 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -34,8 +37,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..1af8687f845b 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -34,8 +37,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..e38a155ef5f2 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..affb840c3ab4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -34,8 +37,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..7a500554b73d 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -34,8 +37,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..affb840c3ab4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -34,8 +37,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..7a500554b73d 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -34,8 +37,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..7c219fae8873 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -38,8 +41,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -56,12 +67,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..636bb9f57580 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -38,8 +41,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..8291027de2df 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -38,8 +41,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..576f310704dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -38,8 +41,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..a2ff9c024aa1 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -38,8 +41,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..1e9751674b5c 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -36,8 +39,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -54,12 +65,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..99565fdd8100 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -36,8 +39,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..8b386dc1c259 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -36,8 +39,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..1b9ae49cbba9 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -36,8 +39,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f52bfdb59a5a 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -36,8 +39,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..2eafd30dab4f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -38,8 +41,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -56,12 +67,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..11adc3e6f34b 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -38,8 +41,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..4995a41655d5 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -38,8 +41,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..c6be2ac5dba1 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -38,8 +41,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..c9ccdb4622c7 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -38,8 +41,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -56,12 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..93bd3076f516 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum CodesEnum { CODE_3("Code 3"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (CodesEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + CodesEnum(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static CodesEnum fromValue(String value) { - for (CodesEnum b : CodesEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..d1704a009f7d 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..b7d0f88bff7c 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..bd771c0ea342 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,9 @@ import android.os.Parcel; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -37,8 +40,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,14 +62,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..6596f8461c6a 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,9 @@ import android.os.Parcel; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -37,8 +40,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,14 +62,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..d1704a009f7d 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..89935a3449a3 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -31,8 +34,16 @@ public enum NullableEnum { CUSTOM("custom"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (NullableEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + NullableEnum(String value) { this.value = value; } @@ -45,14 +56,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static NullableEnum fromValue(String value) { - for (NullableEnum b : NullableEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); } public static class Adapter extends TypeAdapter { 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..c8d3a7c578d9 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -39,8 +42,16 @@ public enum OuterEnum { UPPER_CASE_S("S"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -53,14 +64,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); } public static class Adapter extends TypeAdapter { 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..46e8c980261d 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -49,14 +60,9 @@ public String getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..9ff565a8b568 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -36,8 +39,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,14 +61,9 @@ public Integer getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..9b5ef9b139e4 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,9 @@ import com.google.gson.annotations.SerializedName; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -35,8 +38,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -49,14 +60,9 @@ public Integer getValue() { public String toString() { return String.valueOf(value); } - +// public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..3196835dba2e 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -53,12 +64,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..d3744a93434a 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -53,12 +64,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..3b7b98bbdd30 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -38,8 +41,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..8a929ad1a37f 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -38,8 +41,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1190cf5abe3c..64c4f470c5dd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 4cd955b63dc3..f46764f0d7ce 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 73077cc8c31c..6ba6a6bb250f 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 e6c2e38c2e7c..06b28d32cf87 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 ef61373b187f..f3e3c70bfecd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 f99224547559..293999247999 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 1190cf5abe3c..64c4f470c5dd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 4cd955b63dc3..f46764f0d7ce 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 73077cc8c31c..6ba6a6bb250f 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 e6c2e38c2e7c..06b28d32cf87 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 ef61373b187f..f3e3c70bfecd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 f99224547559..293999247999 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 1190cf5abe3c..64c4f470c5dd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 4cd955b63dc3..f46764f0d7ce 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 73077cc8c31c..6ba6a6bb250f 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 e6c2e38c2e7c..06b28d32cf87 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 ef61373b187f..f3e3c70bfecd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 f99224547559..293999247999 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 1190cf5abe3c..64c4f470c5dd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 4cd955b63dc3..f46764f0d7ce 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 73077cc8c31c..6ba6a6bb250f 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 e6c2e38c2e7c..06b28d32cf87 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 ef61373b187f..f3e3c70bfecd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 f99224547559..293999247999 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 18f9f754469f..b1d107c74b20 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -39,8 +42,16 @@ public enum EnumClass { @XmlEnumValue("(xyz)") _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -57,12 +68,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 c47ace86d444..cbb75f838325 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -39,8 +42,16 @@ public enum OuterEnum { @XmlEnumValue("delivered") DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -57,12 +68,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 aa3e5b9e54b0..6738eae01b3a 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -39,8 +42,16 @@ public enum OuterEnumDefaultValue { @XmlEnumValue("delivered") DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -57,12 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 9d83bea59d57..02e8445a8a5a 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -39,8 +42,16 @@ public enum OuterEnumInteger { @XmlEnumValue("2") NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -57,12 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 fa48c14eafc3..7fb9927af2d1 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -39,8 +42,16 @@ public enum OuterEnumIntegerDefaultValue { @XmlEnumValue("2") NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -57,12 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 c3572a33364a..d54dbdf95b91 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 @@ -24,6 +24,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -36,8 +39,16 @@ public enum SingleRefType { @XmlEnumValue("user") USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 1190cf5abe3c..64c4f470c5dd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 4cd955b63dc3..f46764f0d7ce 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 73077cc8c31c..6ba6a6bb250f 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 e6c2e38c2e7c..06b28d32cf87 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 ef61373b187f..f3e3c70bfecd 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 f99224547559..293999247999 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 @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..df84b13b91e5 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -34,8 +37,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..e47462ed9d7c 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -34,8 +37,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..13402511505b 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..1e8df5293f27 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..13402511505b 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..1e8df5293f27 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..13402511505b 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -35,8 +38,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - for (EnumClass b : EnumClass.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..1e8df5293f27 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,9 @@ 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; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -35,8 +38,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..e38a155ef5f2 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..64c4f470c5dd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -32,8 +35,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -50,12 +61,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f46764f0d7ce 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -32,8 +35,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..6ba6a6bb250f 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..06b28d32cf87 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -32,8 +35,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f3e3c70bfecd 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -32,8 +35,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -50,12 +61,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..293999247999 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -30,8 +33,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -48,12 +59,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..51db29035ea7 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -36,8 +39,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -54,12 +65,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..3dfd33530917 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -36,8 +39,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..832f7cafd0a4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -36,8 +39,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..3b6ba47d78bb 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -36,8 +39,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..809ec5931f6e 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -36,8 +39,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -54,12 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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..a675fe92e9f8 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -34,8 +37,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..6a585cea84b2 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -34,8 +37,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -52,12 +63,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..33d0db26c0ed 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -33,8 +36,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..49d61810f2e3 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -33,8 +36,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..f9216244a6e5 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +36,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..f10fae254f99 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -33,8 +36,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..ff34658ea533 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +36,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..50c947020244 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -31,8 +34,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -49,12 +60,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..33d0db26c0ed 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -33,8 +36,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..eb83ae8691d4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -33,8 +36,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..33d0db26c0ed 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -33,8 +36,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..eb83ae8691d4 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -33,8 +36,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..7e4c005e34ec 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets EnumClass @@ -33,8 +36,16 @@ public enum EnumClass { _XYZ_("(xyz)"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (EnumClass e: values()) { + BY_VALUE.put(e.value, e); + } + } + EnumClass(String value) { this.value = value; } @@ -51,12 +62,7 @@ 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 + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..fee3e1a3a68a 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnum @@ -33,8 +36,16 @@ public enum OuterEnum { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnum e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnum(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - for (OuterEnum b : OuterEnum.values()) { - if (b.value.equals(value)) { - return b; - } - } - return null; + return Optional.ofNullable(BY_VALUE.get(value)).orElse(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..675859292d9c 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -33,8 +36,16 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (OuterEnumDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumDefaultValue(String value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..ea62ff15a2aa 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -33,8 +36,16 @@ public enum OuterEnumInteger { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumInteger e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumInteger(Integer value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - for (OuterEnumInteger b : OuterEnumInteger.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..ba8a8dbb4a15 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -33,8 +36,16 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); + private static final Map BY_VALUE = new HashMap<>(); + private Integer value; + static { + for (OuterEnumIntegerDefaultValue e: values()) { + BY_VALUE.put(e.value, e); + } + } + OuterEnumIntegerDefaultValue(Integer value) { this.value = value; } @@ -51,12 +62,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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..e4500fe06def 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,9 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; /** * Gets or Sets SingleRefType @@ -31,8 +34,16 @@ public enum SingleRefType { USER("user"); + private static final Map BY_VALUE = new HashMap<>(); + private String value; + static { + for (SingleRefType e: values()) { + BY_VALUE.put(e.value, e); + } + } + SingleRefType(String value) { this.value = value; } @@ -49,12 +60,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - for (SingleRefType b : SingleRefType.values()) { - if (b.value.equals(value)) { - return b; - } - } - throw new IllegalArgumentException("Unexpected value '" + value + "'"); + return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } From f58117c55c2b9c524c78e488e77b873e8550df24 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Tue, 17 Feb 2026 20:25:41 +0100 Subject: [PATCH 04/19] chore: add perf JMH script --- perf/jmh/dependency-reduced-pom.xml | 59 +++++ perf/jmh/pom.xml | 72 ++++++ .../perf/EnumLookupJmhBenchmark.java | 235 ++++++++++++++++++ 3 files changed, 366 insertions(+) create mode 100644 perf/jmh/dependency-reduced-pom.xml create mode 100644 perf/jmh/pom.xml create mode 100644 perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java diff --git a/perf/jmh/dependency-reduced-pom.xml b/perf/jmh/dependency-reduced-pom.xml new file mode 100644 index 000000000000..2d344786795c --- /dev/null +++ b/perf/jmh/dependency-reduced-pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + org.openapitools + enum-lookup-jmh + Enum Lookup JMH + 1.0-SNAPSHOT + + + + maven-compiler-plugin + 3.11.0 + + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + + + + maven-shade-plugin + 3.5.0 + + + package + + shade + + + benchmarks + + + org.openjdk.jmh.Main + + + + + + + + + + + org.openjdk.jmh + jmh-generator-annprocess + 1.37 + provided + + + + 1.37 + 11 + 11 + UTF-8 + + diff --git a/perf/jmh/pom.xml b/perf/jmh/pom.xml new file mode 100644 index 000000000000..8290eacb050c --- /dev/null +++ b/perf/jmh/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + org.openapitools + enum-lookup-jmh + 1.0-SNAPSHOT + Enum Lookup JMH + + + 11 + 11 + 1.37 + UTF-8 + + + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.0 + + + package + + shade + + + benchmarks + + + org.openjdk.jmh.Main + + + + + + + + + diff --git a/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java new file mode 100644 index 000000000000..436e54148dca --- /dev/null +++ b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java @@ -0,0 +1,235 @@ +/** + * This is a performance benchmark that MUST be deleted before merging, as it is not intended to be part of the codebase. + * It is only meant to be used for local testing and experimentation while the PR is on the fly. + * The benchmark compares the performance of different approaches to look up enum values by their string representation, including: + * - A HashMap-based lookup (case-sensitive) + * - A TreeMap-based lookup (case-insensitive) + * - A linear search (case-sensitive) + * - A linear search (case-insensitive) + * The benchmark generates random inputs based on a predefined set of fruit names and measures the average time + * taken for each lookup method to find the corresponding enum value. + * + * How to run this benchmark: + * `./mvnw -f perf/jmh/pom.xml -q clean package && java -jar perf/jmh/target/benchmarks.jar EnumLookupJmhBenchmark` + */ +package org.openapitools.perf; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.TreeMap; +import java.util.Optional; +import java.util.Locale; +import java.util.concurrent.TimeUnit; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +@BenchmarkMode(Mode.Throughput) +@Warmup(iterations = 3, time = 1) +@Measurement(iterations = 5, time = 1) +@Fork(1) +public class EnumLookupJmhBenchmark { + private enum Fruit { + APPLE("apple"), + BANANA("banana"), + CHERRY("cherry"), + DATE("date"), + ELDERBERRY("elderberry"), + FIG("fig"), + GRAPE("grape"), + HONEYDEW("honeydew"), + KIWI("kiwi"), + LEMON("lemon"), + MANGO("mango"), + NECTARINE("nectarine"), + ORANGE("orange"), + PAPAYA("papaya"), + QUINCE("quince"), + RASPBERRY("raspberry"), + STRAWBERRY("strawberry"), + TANGERINE("tangerine"), + UGLI("ugli"), + WATERMELON("watermelon"), + AVOCADO("avocado"), + BLACKBERRY("blackberry"), + CANTALOUPE("cantaloupe"), + DRAGONFRUIT("dragonfruit"), + GRAPEFRUIT("grapefruit"), + HUCKLEBERRY("huckleberry"), + JACKFRUIT("jackfruit"), + LIME("lime"), + PAPAW("papaw"), + PEACH("peach"), + PEAR("pear"), + PLUM("plum"), + POMEGRANATE("pomegranate"), + STARFRUIT("starfruit"), + TOMATO("tomato"), // yes, it's a fruit! + YUZU("yuzu"); + + private static final Map BY_VALUE_HASHMAP = new HashMap<>(); + private static final Map BY_VALUE_TREEMAP = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + + private final String value; + + static { + for (Fruit fruit : values()) { + BY_VALUE_HASHMAP.put(fruit.value, fruit); + BY_VALUE_TREEMAP.put(fruit.value, fruit); + } + } + + Fruit(String value) { + this.value = value; + } + + public static Fruit fromValueHashMap(String value) { + Fruit result = BY_VALUE_HASHMAP.get(value); + if (result == null) { + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + return result; + } + + public static Fruit fromValueHashMapCaseInsensitiveWithOptional(String value) { + return Optional.ofNullable(value == null ? null : BY_VALUE_HASHMAP.get(value.toLowerCase(Locale.ROOT))).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Fruit fromValueHashMapWithOptional(String value) { + return Optional.ofNullable(BY_VALUE_HASHMAP.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Fruit fromValueTreeMapWithOptional(String value) { + return Optional.ofNullable(BY_VALUE_TREEMAP.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Fruit fromValueLinear(String value) { + for (Fruit b : Fruit.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Fruit fromValueLinearCaseInsensitive(String value) { + for (Fruit b : Fruit.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @State(Scope.Thread) + public static class LookupState { + @Param({"50000"}) + public int inputSize; + + private String[] exactInputs; + private String[] mixedCaseInputs; + private int index; + + @Setup(Level.Trial) + public void setup() { + exactInputs = buildInputs(inputSize, false); + mixedCaseInputs = buildInputs(inputSize, true); + index = 0; + } + + public String nextExact() { + String value = exactInputs[index++ % exactInputs.length]; + return value; + } + + public String nextMixedCase() { + String value = mixedCaseInputs[index++ % mixedCaseInputs.length]; + return value; + } + } + + @Benchmark + public void hashMapLookup(LookupState state, Blackhole blackhole) { + String value = state.nextExact(); + Fruit result = Fruit.fromValueHashMap(value); + blackhole.consume(result); + } + + @Benchmark + public void hashMapLookupCaseInsensitive(LookupState state, Blackhole blackhole) { + String value = state.nextMixedCase(); + Fruit result = Fruit.fromValueHashMapCaseInsensitiveWithOptional(value); + blackhole.consume(result); + } + + @Benchmark + public void hashMapLookupWithOptional(LookupState state, Blackhole blackhole) { + String value = state.nextExact(); + Fruit result = Fruit.fromValueHashMapWithOptional(value); + blackhole.consume(result); + } + + @Benchmark + public void linearLookup(LookupState state, Blackhole blackhole) { + String value = state.nextExact(); + Fruit result = Fruit.fromValueLinear(value); + blackhole.consume(result); + } + + @Benchmark + public void linearLookupCaseInsensitive(LookupState state, Blackhole blackhole) { + String value = state.nextMixedCase(); + Fruit result = Fruit.fromValueLinearCaseInsensitive(value); + blackhole.consume(result); + } + + + @Benchmark + public void treeMapLookupCaseInsensitiveWithOptional(LookupState state, Blackhole blackhole) { + String value = state.nextMixedCase(); + Fruit result = Fruit.fromValueTreeMapWithOptional(value); + blackhole.consume(result); + } + + + private static String[] buildInputs(int size, boolean mixedCase) { + String[] values = new String[size]; + Fruit[] fruits = Fruit.values(); + Random random = new Random(42); // The meaning of life, the universe, and everything + for (int i = 0; i < size; i++) { + String value = fruits[random.nextInt(fruits.length)].value; + if (mixedCase && random.nextBoolean()) { + value = swapCase(value); + } + values[i] = value; + } + return values; + } + + private static String swapCase(String value) { + StringBuilder builder = new StringBuilder(value.length()); + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (Character.isUpperCase(c)) { + builder.append(Character.toLowerCase(c)); + } else if (Character.isLowerCase(c)) { + builder.append(Character.toUpperCase(c)); + } else { + builder.append(c); + } + } + return builder.toString(); + } +} From 79a9da0dbe9dc920d7c370794ffa466751e99d02 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Tue, 17 Feb 2026 21:11:35 +0100 Subject: [PATCH 05/19] feat: only use HashMap with toLowerCase for insensitive search --- .../resources/Java/libraries/native/modelEnum.mustache | 7 ++++--- .../Java/libraries/okhttp-gson/modelEnum.mustache | 9 +++++---- .../src/main/resources/Java/modelEnum.mustache | 7 ++++--- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 7 ++++--- .../java-helidon/server/libraries/mp/modelEnum.mustache | 7 ++++--- .../java-micronaut/common/model/modelEnum.mustache | 9 +++++---- 6 files changed, 26 insertions(+), 20 deletions(-) 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 8342da1ad803..b70a3abe1cd3 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,7 +12,8 @@ import com.google.gson.stream.JsonWriter; {{#isUri}} import java.net.URI; {{/isUri}} -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -42,7 +43,7 @@ import java.util.Optional; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -72,7 +73,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#supportUrlQuery}} 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 b118b0853f3a..9de5c716ebcb 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,7 +2,8 @@ import java.io.IOException; {{#isUri}} import java.net.URI; {{/isUri}} -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; import com.google.gson.TypeAdapter; @@ -31,7 +32,7 @@ import com.google.gson.stream.JsonWriter; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -53,9 +54,9 @@ import com.google.gson.stream.JsonWriter; public String toString() { return String.valueOf(value); } -// + public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 1c0add9c23c7..1db76ffc251e 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -12,7 +12,8 @@ import com.google.gson.stream.JsonWriter; {{#isUri}} import java.net.URI; {{/isUri}} -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -42,7 +43,7 @@ import java.util.Optional; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -72,7 +73,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#gson}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 37acac6f9176..4a7926e37a61 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -2,7 +2,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; {{/jackson}} -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -25,7 +26,7 @@ import java.util.Optional; {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} {{/gson}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -54,7 +55,7 @@ import java.util.Optional; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 f2ccb2a08827..6d9af468d4a7 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,4 +1,5 @@ -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -32,7 +33,7 @@ import java.util.Optional; {{/enumVars}} {{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -58,7 +59,7 @@ import java.util.Optional; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 3b484a051014..fd55dcc13abe 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,7 +2,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; {{/jackson}} -{{#useEnumCaseInsensitive}}import java.util.TreeMap{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}import java.util.HashMap{{/useEnumCaseInsensitive}}; +{{#useEnumCaseInsensitive}}import java.util.Locale; +{{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -30,7 +31,7 @@ import java.util.Optional; {{/enumVars}} {{/allowableValues}} - private static final Map<{{{dataType}}}, {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = {{#useEnumCaseInsensitive}}new TreeMap<>(String.CASE_INSENSITIVE_ORDER);{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}new HashMap<>(){{/useEnumCaseInsensitive}}; + private static final Map<{{{dataType}}}, {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); private {{{dataType}}} value; @@ -55,11 +56,11 @@ import java.util.Optional; public String toString() { return String.valueOf(value); } -// + {{#jackson}} @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(BY_VALUE.get(value)).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } } From de68f0e41b14de5706b9108a303fe7052569c576 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Tue, 17 Feb 2026 21:33:55 +0100 Subject: [PATCH 06/19] test: update test to account for toLowerCase case --- .../org/openapitools/codegen/java/JavaClientCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0ef77e758562..b853e522272a 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 @@ -2378,7 +2378,7 @@ public void testEnumCaseInsensitive_issue8084() { assertThat(files.get("EnumTest.java")) .content() - .contains("new TreeMap<>(String.CASE_INSENSITIVE_ORDER)"); + .contains("toLowerCase(Locale.ROOT)"); } @Test From 582b52598ec24bc481dfcff8133bd3b7e7621151 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Tue, 17 Feb 2026 21:35:28 +0100 Subject: [PATCH 07/19] chore: update samples --- .../main/java/org/openapitools/client/model/StringEnumRef.java | 2 +- .../src/main/java/org/openapitools/model/EnumClass.java | 2 +- .../src/main/java/org/openapitools/model/OuterEnum.java | 2 +- .../src/main/java/org/openapitools/client/model/CodesEnum.java | 2 +- .../src/main/java/org/openapitools/client/model/EnumClass.java | 2 +- .../src/main/java/org/openapitools/client/model/OuterEnum.java | 2 +- .../src/main/java/org/openapitools/client/model/EnumClass.java | 2 +- .../src/main/java/org/openapitools/client/model/OuterEnum.java | 2 +- .../src/main/java/org/openapitools/client/model/EnumClass.java | 2 +- .../main/java/org/openapitools/client/model/NullableEnum.java | 2 +- .../src/main/java/org/openapitools/client/model/OuterEnum.java | 2 +- .../org/openapitools/client/model/OuterEnumDefaultValue.java | 2 +- .../java/org/openapitools/client/model/OuterEnumInteger.java | 2 +- .../openapitools/client/model/OuterEnumIntegerDefaultValue.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) 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 95a4bebd3bff..3a28fc0b56a8 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static StringEnumRef fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 daba41d09ed4..9f2c90471dcc 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 @@ -59,7 +59,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + @JsonCreator public static EnumClass fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 b04c43c68320..80c0785790e2 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 @@ -59,7 +59,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + @JsonCreator public static OuterEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 93bd3076f516..2dc506cca9a3 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static CodesEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 d1704a009f7d..1c53bf2ba769 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static EnumClass fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 b7d0f88bff7c..13b68e08a891 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 bd771c0ea342..6d25173017bf 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 @@ -62,7 +62,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static EnumClass fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 6596f8461c6a..218d5df040e8 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 @@ -62,7 +62,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 d1704a009f7d..1c53bf2ba769 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static EnumClass fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 89935a3449a3..16c21ede78e0 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 @@ -56,7 +56,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static NullableEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 c8d3a7c578d9..c1d68c5edaae 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 @@ -64,7 +64,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnum fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElse(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 46e8c980261d..e60356884327 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 @@ -60,7 +60,7 @@ public String getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnumDefaultValue fromValue(String value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 9ff565a8b568..58206d863dfb 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 @@ -61,7 +61,7 @@ public Integer getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnumInteger fromValue(Integer value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> 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 9b5ef9b139e4..62ca1307bf76 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 @@ -60,7 +60,7 @@ public Integer getValue() { public String toString() { return String.valueOf(value); } -// + public static OuterEnumIntegerDefaultValue fromValue(Integer value) { return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } From 540537e891494593fb13c98eab315a3c9d20f282 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Tue, 17 Feb 2026 21:43:11 +0100 Subject: [PATCH 08/19] perf: rename method --- .../java/org/openapitools/perf/EnumLookupJmhBenchmark.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java index 436e54148dca..1fd7c5e883fa 100644 --- a/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java +++ b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java @@ -94,7 +94,7 @@ private enum Fruit { this.value = value; } - public static Fruit fromValueHashMap(String value) { + public static Fruit fromValueHashMapWithoutOptional(String value) { Fruit result = BY_VALUE_HASHMAP.get(value); if (result == null) { throw new IllegalArgumentException("Unexpected value '" + value + "'"); @@ -161,9 +161,9 @@ public String nextMixedCase() { } @Benchmark - public void hashMapLookup(LookupState state, Blackhole blackhole) { + public void hashMapLookupWithoutOptional(LookupState state, Blackhole blackhole) { String value = state.nextExact(); - Fruit result = Fruit.fromValueHashMap(value); + Fruit result = Fruit.fromValueHashMapWithoutOptional(value); blackhole.consume(result); } From a721750cefad8432dea7f8e592644409280366ae Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 17:40:47 +0100 Subject: [PATCH 09/19] fix: add containsKey to preserver find order --- .../resources/Java/libraries/native/modelEnum.mustache | 7 +++++-- .../Java/libraries/okhttp-gson/modelEnum.mustache | 7 +++++-- .../src/main/resources/Java/modelEnum.mustache | 7 +++++-- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 7 +++++-- .../java-helidon/server/libraries/mp/modelEnum.mustache | 7 +++++-- .../java-micronaut/common/model/modelEnum.mustache | 7 +++++-- 6 files changed, 30 insertions(+), 12 deletions(-) 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 b70a3abe1cd3..2aa7c043c528 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 @@ -49,7 +49,10 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -73,7 +76,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#supportUrlQuery}} 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 9de5c716ebcb..d3290fc073bf 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 @@ -38,7 +38,10 @@ import com.google.gson.stream.JsonWriter; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -56,7 +59,7 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 1db76ffc251e..0d533e2d2120 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -49,7 +49,10 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -73,7 +76,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#gson}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 4a7926e37a61..79e40bbf005a 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -32,7 +32,10 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -55,7 +58,7 @@ import java.util.Optional; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 6d9af468d4a7..2dc3b19c65d9 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 @@ -39,7 +39,10 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ import java.util.Optional; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 fd55dcc13abe..609c51242bfb 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 @@ -37,7 +37,10 @@ import java.util.Optional; static { for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - BY_VALUE.put(e.value, e); + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,6 +64,6 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } } From 5bb18ae94c4b993113f6d04a76c27846d7c9f05f Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 17:43:06 +0100 Subject: [PATCH 10/19] test: update benchmark to better reflect current algo --- .../perf/EnumLookupJmhBenchmark.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java index 1fd7c5e883fa..61dcf03b9f22 100644 --- a/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java +++ b/perf/jmh/src/main/java/org/openapitools/perf/EnumLookupJmhBenchmark.java @@ -2,8 +2,9 @@ * This is a performance benchmark that MUST be deleted before merging, as it is not intended to be part of the codebase. * It is only meant to be used for local testing and experimentation while the PR is on the fly. * The benchmark compares the performance of different approaches to look up enum values by their string representation, including: - * - A HashMap-based lookup (case-sensitive) - * - A TreeMap-based lookup (case-insensitive) + * - A HashMap-based lookup (case-sensitive, exact key) + * - A HashMap-based lookup (case-insensitive, lowercased key) + * - A TreeMap-based lookup (case-insensitive comparator) * - A linear search (case-sensitive) * - A linear search (case-insensitive) * The benchmark generates random inputs based on a predefined set of fruit names and measures the average time @@ -78,14 +79,19 @@ private enum Fruit { TOMATO("tomato"), // yes, it's a fruit! YUZU("yuzu"); - private static final Map BY_VALUE_HASHMAP = new HashMap<>(); + private static final Map BY_VALUE_HASHMAP_CS = new HashMap<>(); + private static final Map BY_VALUE_HASHMAP_CI = new HashMap<>(); private static final Map BY_VALUE_TREEMAP = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); private final String value; static { for (Fruit fruit : values()) { - BY_VALUE_HASHMAP.put(fruit.value, fruit); + BY_VALUE_HASHMAP_CS.put(fruit.value, fruit); + String key = fruit == null ? null : fruit.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_HASHMAP_CI.containsKey(key)) { + BY_VALUE_HASHMAP_CI.put(key, fruit); + } BY_VALUE_TREEMAP.put(fruit.value, fruit); } } @@ -95,7 +101,7 @@ private enum Fruit { } public static Fruit fromValueHashMapWithoutOptional(String value) { - Fruit result = BY_VALUE_HASHMAP.get(value); + Fruit result = BY_VALUE_HASHMAP_CS.get(value); if (result == null) { throw new IllegalArgumentException("Unexpected value '" + value + "'"); } @@ -103,11 +109,11 @@ public static Fruit fromValueHashMapWithoutOptional(String value) { } public static Fruit fromValueHashMapCaseInsensitiveWithOptional(String value) { - return Optional.ofNullable(value == null ? null : BY_VALUE_HASHMAP.get(value.toLowerCase(Locale.ROOT))).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value == null ? null : BY_VALUE_HASHMAP_CI.get(value.toLowerCase(Locale.ROOT))).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static Fruit fromValueHashMapWithOptional(String value) { - return Optional.ofNullable(BY_VALUE_HASHMAP.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(BY_VALUE_HASHMAP_CS.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static Fruit fromValueTreeMapWithOptional(String value) { From c9269de679ff4685cc5e215fe31e63e7d01d35e9 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 18:29:40 +0100 Subject: [PATCH 11/19] fix: get before put on static block --- .../main/resources/Java/libraries/native/modelEnum.mustache | 4 ++-- .../resources/Java/libraries/okhttp-gson/modelEnum.mustache | 4 ++-- .../src/main/resources/Java/modelEnum.mustache | 4 ++-- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 4 ++-- .../java-helidon/server/libraries/mp/modelEnum.mustache | 4 ++-- .../resources/java-micronaut/common/model/modelEnum.mustache | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 2aa7c043c528..4174fb392385 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 @@ -49,7 +49,7 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -76,7 +76,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#supportUrlQuery}} 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 d3290fc073bf..f4d69c4f8d12 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 @@ -38,7 +38,7 @@ import com.google.gson.stream.JsonWriter; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -59,7 +59,7 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 0d533e2d2120..3d16414daf23 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -49,7 +49,7 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -76,7 +76,7 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } {{#gson}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 79e40bbf005a..a180b17ebbc8 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -32,7 +32,7 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -58,7 +58,7 @@ import java.util.Optional; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 2dc3b19c65d9..f4600e87512e 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 @@ -39,7 +39,7 @@ import java.util.Optional; static { for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -62,7 +62,7 @@ import java.util.Optional; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> 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 609c51242bfb..137a973abdb4 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 @@ -37,7 +37,7 @@ import java.util.Optional; static { for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} e: values()) { - {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; + {{{dataType}}} key = {{#useEnumCaseInsensitive}}{{#isString}}e.value == null ? null : e.value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}e.value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}e.value{{/useEnumCaseInsensitive}}; if (!BY_VALUE.containsKey(key)) { BY_VALUE.put(key, e); } @@ -64,6 +64,6 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable({{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : BY_VALUE.get(value.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(value){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(value){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; } } From fd414bc3902314525346a1960346c831b96a046e Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 19:22:56 +0100 Subject: [PATCH 12/19] perf: add small enum bench --- .../perf/SmallEnumLookupJmhBenchmark.java | 918 ++++++++++++++++++ 1 file changed, 918 insertions(+) create mode 100644 perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java diff --git a/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java b/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java new file mode 100644 index 000000000000..bc8f8864a541 --- /dev/null +++ b/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java @@ -0,0 +1,918 @@ +/** + * This is a performance benchmark that MUST be deleted before merging, as it is not intended to be part of the codebase. + * It is only meant to be used for local testing and experimentation while the PR is on the fly. + * The benchmark compares lookup approaches for small enums with 1 to 10 values, mirroring current enum generation. + * + * How to run this benchmark: + * `./mvnw -f perf/jmh/pom.xml -q clean package && java -jar perf/jmh/target/benchmarks.jar SmallEnumLookupJmhBenchmark` + * To save it to a CSV: + * `./mvnw -f perf/jmh/pom.xml -q clean package && java -jar perf/jmh/target/benchmarks.jar SmallEnumLookupJmhBenchmark -rf csv -rff perf/jmh/target/perf-small-enum.csv` + */ +package org.openapitools.perf; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Random; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +@BenchmarkMode(Mode.Throughput) +@Warmup(iterations = 1, time = 1) +@Measurement(iterations = 10, time = 1) +@Fork(1) +@OutputTimeUnit(TimeUnit.SECONDS) +public class SmallEnumLookupJmhBenchmark { + private enum Tiny1 { + ONE("one"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny1 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny1(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny1 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny1 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny1 fromValueLinear(String value) { + for (Tiny1 b : Tiny1.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny1 fromValueLinearCaseInsensitive(String value) { + for (Tiny1 b : Tiny1.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny2 { + ONE("one"), + TWO("two"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny2 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny2(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny2 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny2 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny2 fromValueLinear(String value) { + for (Tiny2 b : Tiny2.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny2 fromValueLinearCaseInsensitive(String value) { + for (Tiny2 b : Tiny2.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny3 { + ONE("one"), + TWO("two"), + THREE("three"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny3 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny3(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny3 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny3 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny3 fromValueLinear(String value) { + for (Tiny3 b : Tiny3.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny3 fromValueLinearCaseInsensitive(String value) { + for (Tiny3 b : Tiny3.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny4 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny4 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny4(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny4 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny4 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny4 fromValueLinear(String value) { + for (Tiny4 b : Tiny4.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny4 fromValueLinearCaseInsensitive(String value) { + for (Tiny4 b : Tiny4.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny5 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny5 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny5(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny5 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny5 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny5 fromValueLinear(String value) { + for (Tiny5 b : Tiny5.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny5 fromValueLinearCaseInsensitive(String value) { + for (Tiny5 b : Tiny5.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny6 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"), + SIX("six"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny6 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny6(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny6 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny6 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny6 fromValueLinear(String value) { + for (Tiny6 b : Tiny6.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny6 fromValueLinearCaseInsensitive(String value) { + for (Tiny6 b : Tiny6.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny7 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"), + SIX("six"), + SEVEN("seven"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny7 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny7(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny7 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny7 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny7 fromValueLinear(String value) { + for (Tiny7 b : Tiny7.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny7 fromValueLinearCaseInsensitive(String value) { + for (Tiny7 b : Tiny7.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny8 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"), + SIX("six"), + SEVEN("seven"), + EIGHT("eight"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny8 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny8(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny8 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny8 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny8 fromValueLinear(String value) { + for (Tiny8 b : Tiny8.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny8 fromValueLinearCaseInsensitive(String value) { + for (Tiny8 b : Tiny8.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny9 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"), + SIX("six"), + SEVEN("seven"), + EIGHT("eight"), + NINE("nine"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny9 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny9(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny9 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny9 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny9 fromValueLinear(String value) { + for (Tiny9 b : Tiny9.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny9 fromValueLinearCaseInsensitive(String value) { + for (Tiny9 b : Tiny9.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private enum Tiny10 { + ONE("one"), + TWO("two"), + THREE("three"), + FOUR("four"), + FIVE("five"), + SIX("six"), + SEVEN("seven"), + EIGHT("eight"), + NINE("nine"), + TEN("ten"); + + private static final Map BY_VALUE_CS = new HashMap<>(); + private static final Map BY_VALUE_CI = new HashMap<>(); + + private final String value; + + static { + for (Tiny10 e : values()) { + if (!BY_VALUE_CS.containsKey(e.value)) { + BY_VALUE_CS.put(e.value, e); + } + String key = e.value == null ? null : e.value.toLowerCase(Locale.ROOT); + if (!BY_VALUE_CI.containsKey(key)) { + BY_VALUE_CI.put(key, e); + } + } + } + + Tiny10(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static Tiny10 fromValue(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny10 fromValueCaseInsensitive(String value) { + return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) + .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + } + + public static Tiny10 fromValueLinear(String value) { + for (Tiny10 b : Tiny10.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static Tiny10 fromValueLinearCaseInsensitive(String value) { + for (Tiny10 b : Tiny10.values()) { + if (b.value.equalsIgnoreCase(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + @State(Scope.Thread) + public static class LookupState { + @Param({"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}) + public int enumSize; + + @Param({"50000"}) + public int inputSize; + + private String[] exactInputs; + private String[] mixedCaseInputs; + private int index; + private LookupFunctions functions; + + @Setup(Level.Trial) + public void setup() { + functions = LookupFunctions.forSize(enumSize); + exactInputs = buildInputs(inputSize, false, functions.values); + mixedCaseInputs = buildInputs(inputSize, true, functions.values); + index = 0; + } + + public String nextExact() { + return exactInputs[index++ % exactInputs.length]; + } + + public String nextMixedCase() { + return mixedCaseInputs[index++ % mixedCaseInputs.length]; + } + } + + private static final class LookupFunctions { + private final String[] values; + private final Function hashMap; + private final Function hashMapCaseInsensitive; + private final Function linear; + private final Function linearCaseInsensitive; + + private LookupFunctions( + String[] values, + Function hashMap, + Function hashMapCaseInsensitive, + Function linear, + Function linearCaseInsensitive) { + this.values = values; + this.hashMap = hashMap; + this.hashMapCaseInsensitive = hashMapCaseInsensitive; + this.linear = linear; + this.linearCaseInsensitive = linearCaseInsensitive; + } + + private static LookupFunctions forSize(int size) { + switch (size) { + case 1: + return new LookupFunctions( + enumValues(Tiny1.values()), + Tiny1::fromValue, + Tiny1::fromValueCaseInsensitive, + Tiny1::fromValueLinear, + Tiny1::fromValueLinearCaseInsensitive); + case 2: + return new LookupFunctions( + enumValues(Tiny2.values()), + Tiny2::fromValue, + Tiny2::fromValueCaseInsensitive, + Tiny2::fromValueLinear, + Tiny2::fromValueLinearCaseInsensitive); + case 3: + return new LookupFunctions( + enumValues(Tiny3.values()), + Tiny3::fromValue, + Tiny3::fromValueCaseInsensitive, + Tiny3::fromValueLinear, + Tiny3::fromValueLinearCaseInsensitive); + case 4: + return new LookupFunctions( + enumValues(Tiny4.values()), + Tiny4::fromValue, + Tiny4::fromValueCaseInsensitive, + Tiny4::fromValueLinear, + Tiny4::fromValueLinearCaseInsensitive); + case 5: + return new LookupFunctions( + enumValues(Tiny5.values()), + Tiny5::fromValue, + Tiny5::fromValueCaseInsensitive, + Tiny5::fromValueLinear, + Tiny5::fromValueLinearCaseInsensitive); + case 6: + return new LookupFunctions( + enumValues(Tiny6.values()), + Tiny6::fromValue, + Tiny6::fromValueCaseInsensitive, + Tiny6::fromValueLinear, + Tiny6::fromValueLinearCaseInsensitive); + case 7: + return new LookupFunctions( + enumValues(Tiny7.values()), + Tiny7::fromValue, + Tiny7::fromValueCaseInsensitive, + Tiny7::fromValueLinear, + Tiny7::fromValueLinearCaseInsensitive); + case 8: + return new LookupFunctions( + enumValues(Tiny8.values()), + Tiny8::fromValue, + Tiny8::fromValueCaseInsensitive, + Tiny8::fromValueLinear, + Tiny8::fromValueLinearCaseInsensitive); + case 9: + return new LookupFunctions( + enumValues(Tiny9.values()), + Tiny9::fromValue, + Tiny9::fromValueCaseInsensitive, + Tiny9::fromValueLinear, + Tiny9::fromValueLinearCaseInsensitive); + case 10: + return new LookupFunctions( + enumValues(Tiny10.values()), + Tiny10::fromValue, + Tiny10::fromValueCaseInsensitive, + Tiny10::fromValueLinear, + Tiny10::fromValueLinearCaseInsensitive); + default: + throw new IllegalArgumentException("Unsupported enum size: " + size); + } + } + } + + @Benchmark + public void hashMapLookup(LookupState state, Blackhole blackhole) { + String value = state.nextExact(); + Object result = state.functions.hashMap.apply(value); + blackhole.consume(result); + } + + @Benchmark + public void hashMapLookupCaseInsensitive(LookupState state, Blackhole blackhole) { + String value = state.nextMixedCase(); + Object result = state.functions.hashMapCaseInsensitive.apply(value); + blackhole.consume(result); + } + + @Benchmark + public void linearLookup(LookupState state, Blackhole blackhole) { + String value = state.nextExact(); + Object result = state.functions.linear.apply(value); + blackhole.consume(result); + } + + @Benchmark + public void linearLookupCaseInsensitive(LookupState state, Blackhole blackhole) { + String value = state.nextMixedCase(); + Object result = state.functions.linearCaseInsensitive.apply(value); + blackhole.consume(result); + } + + private static String[] enumValues(Tiny1[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny2[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny3[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny4[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny5[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny6[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny7[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny8[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny9[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] enumValues(Tiny10[] values) { + String[] result = new String[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getValue(); + } + return result; + } + + private static String[] buildInputs(int size, boolean mixedCase, String[] values) { + String[] result = new String[size]; + Random random = new Random(42); + for (int i = 0; i < size; i++) { + String value = values[random.nextInt(values.length)]; + if (mixedCase && random.nextBoolean()) { + value = swapCase(value); + } + result[i] = value; + } + return result; + } + + private static String swapCase(String value) { + StringBuilder builder = new StringBuilder(value.length()); + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (Character.isUpperCase(c)) { + builder.append(Character.toLowerCase(c)); + } else if (Character.isLowerCase(c)) { + builder.append(Character.toUpperCase(c)); + } else { + builder.append(c); + } + } + return builder.toString(); + } +} From ee7cd5db4010aef3ca3f22916f729ad4ff1dd870 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 19:37:30 +0100 Subject: [PATCH 13/19] chore: update samples --- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/DataChannel.java | 7 +++++-- .../java/org/openapitools/client/model/DataDirection.java | 7 +++++-- .../main/java/org/openapitools/client/model/FruitType.java | 7 +++++-- .../main/java/org/openapitools/client/model/FruitType.java | 7 +++++-- .../src/main/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/main/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/CodesEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../java/org/openapitools/client/model/NullableEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../java/org/openapitools/model/OuterEnumDefaultValue.java | 7 +++++-- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 7 +++++-- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/SingleRefType.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../java/org/openapitools/model/OuterEnumDefaultValue.java | 7 +++++-- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 7 +++++-- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/SingleRefType.java | 7 +++++-- 180 files changed, 900 insertions(+), 360 deletions(-) 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 5f90bb977c8f..c35e02972303 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 @@ -44,7 +44,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 42c7c5a527e3..74212f6fc4fe 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 @@ -44,7 +44,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 dd1f7e639c04..536180e1209e 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 @@ -45,7 +45,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 3a28fc0b56a8..0ff0449b2e52 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 @@ -44,7 +44,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 dd9bf3a4b8ae..e1bbdce3d0d7 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 @@ -41,7 +41,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 dd9bf3a4b8ae..e1bbdce3d0d7 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 @@ -41,7 +41,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 dd9bf3a4b8ae..e1bbdce3d0d7 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 @@ -41,7 +41,10 @@ public enum StringEnumRef { static { for (StringEnumRef e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 597b0e9216e9..f7cef7f3c47f 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 @@ -43,7 +43,10 @@ public enum DataChannel { static { for (DataChannel e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static DataChannel fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1facade30e28..d5894bd8f5b7 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 @@ -39,7 +39,10 @@ public enum DataDirection { static { for (DataDirection e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static DataDirection fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1d0be4ff763d..d72249c3a222 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 @@ -39,7 +39,10 @@ public enum FruitType { static { for (FruitType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1d0be4ff763d..d72249c3a222 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 @@ -39,7 +39,10 @@ public enum FruitType { static { for (FruitType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 9f2c90471dcc..b8676c58f6bb 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 @@ -42,7 +42,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 80c0785790e2..2ff79e070f20 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 @@ -42,7 +42,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 18a77e1f23e1..971cb15e7a68 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 4c7891e172d0..472b92951922 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 2577699deea1..e52044f4b821 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 @@ -44,7 +44,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7c1a728b3115..2f34118c8fc9 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 @@ -44,7 +44,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 476b2a579b5e..5a90faf07749 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 @@ -44,7 +44,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 90ca2b48890b..9c98328d41d1 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 @@ -42,7 +42,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f7cf9c014f4a..85b997b8d5a0 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 @@ -43,7 +43,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1af8687f845b..8e791f27faff 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 @@ -43,7 +43,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 e38a155ef5f2..9b6672485fbe 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 affb840c3ab4..0ac1e3510525 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 @@ -43,7 +43,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7a500554b73d..b036f31d5251 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 @@ -43,7 +43,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 affb840c3ab4..0ac1e3510525 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 @@ -43,7 +43,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7a500554b73d..b036f31d5251 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 @@ -43,7 +43,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7c219fae8873..3ca426ad351f 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 @@ -47,7 +47,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 636bb9f57580..b9db9ab467aa 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 @@ -47,7 +47,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 8291027de2df..9385b75d1704 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 @@ -47,7 +47,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 576f310704dd..fd480ee8b11b 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 @@ -47,7 +47,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 a2ff9c024aa1..8f5f471c86a8 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 @@ -47,7 +47,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1e9751674b5c..ccdfb0b8dda4 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 @@ -45,7 +45,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 99565fdd8100..4811d1e42345 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 @@ -45,7 +45,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 8b386dc1c259..e2c44d906847 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 @@ -45,7 +45,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 1b9ae49cbba9..7496fd6a29f6 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 @@ -45,7 +45,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f52bfdb59a5a..ea6684cb7afe 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 @@ -45,7 +45,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 2eafd30dab4f..6cad8eb3e5cb 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 @@ -47,7 +47,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 11adc3e6f34b..253190d5af4f 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 @@ -47,7 +47,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 4995a41655d5..d29a8639de83 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 @@ -47,7 +47,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 c6be2ac5dba1..5bb4893c293a 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 @@ -47,7 +47,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 c9ccdb4622c7..dc780f7183e6 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 @@ -47,7 +47,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -67,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 2dc506cca9a3..ab2f37e16095 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 @@ -44,7 +44,10 @@ public enum CodesEnum { static { for (CodesEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static CodesEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1c53bf2ba769..2190f52cfe32 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 13b68e08a891..584e7849e058 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 6d25173017bf..65a8ba6db59c 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 @@ -46,7 +46,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 218d5df040e8..871feceff6d4 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 @@ -46,7 +46,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1c53bf2ba769..2190f52cfe32 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 16c21ede78e0..ffbc29feefb9 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 @@ -40,7 +40,10 @@ public enum NullableEnum { static { for (NullableEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -58,7 +61,7 @@ public String toString() { } public static NullableEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); } public static class Adapter extends TypeAdapter { 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 c1d68c5edaae..f2c8f8873aae 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 @@ -48,7 +48,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -66,7 +69,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); } public static class Adapter extends TypeAdapter { 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 e60356884327..0ea422dcd8ef 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 @@ -44,7 +44,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 58206d863dfb..5a20782650c6 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 @@ -45,7 +45,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { } public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 62ca1307bf76..eb18bf79acc4 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 @@ -44,7 +44,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 3196835dba2e..5bcf406e075a 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 d3744a93434a..660992f8079d 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -64,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 3b7b98bbdd30..508985f63e3c 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 @@ -47,7 +47,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 8a929ad1a37f..b3764b37132b 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 @@ -47,7 +47,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 b1d107c74b20..ff2424a32c7c 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 @@ -48,7 +48,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -68,7 +71,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 cbb75f838325..3d575eff0c71 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 @@ -48,7 +48,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -68,7 +71,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6738eae01b3a..24f4676726fe 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 @@ -48,7 +48,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -68,7 +71,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 02e8445a8a5a..7d18cd574405 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 @@ -48,7 +48,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -68,7 +71,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7fb9927af2d1..2d67c0e19c1e 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 @@ -48,7 +48,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -68,7 +71,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 d54dbdf95b91..08017d54b696 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 @@ -45,7 +45,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 df84b13b91e5..f53e50e7737a 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 @@ -43,7 +43,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 e47462ed9d7c..a430686dc1bc 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 @@ -43,7 +43,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 13402511505b..7d3690b20e1e 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1e8df5293f27..0559f2013935 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 13402511505b..7d3690b20e1e 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1e8df5293f27..0559f2013935 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 13402511505b..7d3690b20e1e 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 @@ -44,7 +44,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 1e8df5293f27..0559f2013935 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 @@ -44,7 +44,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } public static class Adapter extends TypeAdapter { 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 e38a155ef5f2..9b6672485fbe 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 64c4f470c5dd..d7003575d7f3 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 @@ -41,7 +41,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f46764f0d7ce..6ade1139ec5c 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 @@ -41,7 +41,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 6ba6a6bb250f..1e63a21da8c4 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 @@ -41,7 +41,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 06b28d32cf87..a4140e0f27ea 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 @@ -41,7 +41,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f3e3c70bfecd..6df9e8f888b3 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 @@ -41,7 +41,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -61,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 293999247999..e9747887aab3 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 @@ -39,7 +39,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -59,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 51db29035ea7..e33162c1904b 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 @@ -45,7 +45,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 3dfd33530917..6840de371287 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 @@ -45,7 +45,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 832f7cafd0a4..ed9aef1f683b 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 @@ -45,7 +45,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 3b6ba47d78bb..b91d800cd8a3 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 @@ -45,7 +45,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 809ec5931f6e..09cae41c64a1 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 @@ -45,7 +45,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -65,7 +68,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } 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 a675fe92e9f8..abf98a3dbb89 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 @@ -43,7 +43,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 6a585cea84b2..1cbbefedbc1b 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 @@ -43,7 +43,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -63,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 33d0db26c0ed..a08f71f6dedb 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 @@ -42,7 +42,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 49d61810f2e3..ff0ccb4c49bc 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 @@ -42,7 +42,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 f9216244a6e5..3897ca39008d 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 @@ -42,7 +42,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 f10fae254f99..6885c8992a2c 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 @@ -42,7 +42,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 ff34658ea533..bf62c9928872 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 @@ -42,7 +42,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 50c947020244..689df60db27d 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 @@ -40,7 +40,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -60,7 +63,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 33d0db26c0ed..a08f71f6dedb 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 @@ -42,7 +42,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 eb83ae8691d4..b4d9d02df9e7 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 @@ -42,7 +42,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 33d0db26c0ed..a08f71f6dedb 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 @@ -42,7 +42,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 eb83ae8691d4..b4d9d02df9e7 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 @@ -42,7 +42,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 7e4c005e34ec..706ad0d55071 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 @@ -42,7 +42,10 @@ public enum EnumClass { static { for (EnumClass e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 fee3e1a3a68a..4de04eda1d27 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 @@ -42,7 +42,10 @@ public enum OuterEnum { static { for (OuterEnum e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElse(null); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(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 675859292d9c..dd920032647f 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 @@ -42,7 +42,10 @@ public enum OuterEnumDefaultValue { static { for (OuterEnumDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 ea62ff15a2aa..4216357d34db 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 @@ -42,7 +42,10 @@ public enum OuterEnumInteger { static { for (OuterEnumInteger e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 ba8a8dbb4a15..8e5b93ca1c48 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 @@ -42,7 +42,10 @@ public enum OuterEnumIntegerDefaultValue { static { for (OuterEnumIntegerDefaultValue e: values()) { - BY_VALUE.put(e.value, e); + Integer key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -62,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> 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 e4500fe06def..64e69be55d4f 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 @@ -40,7 +40,10 @@ public enum SingleRefType { static { for (SingleRefType e: values()) { - BY_VALUE.put(e.value, e); + String key = e.value; + if (!BY_VALUE.containsKey(key)) { + BY_VALUE.put(key, e); + } } } @@ -60,7 +63,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(BY_VALUE.get(value)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); } } From afcedec2737e78c214de6fa7591ddecdd6b27fd8 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 20:38:57 +0100 Subject: [PATCH 14/19] refactor: remove Optional in favor on guard clauses --- .../resources/Java/libraries/native/modelEnum.mustache | 7 +++++-- .../Java/libraries/okhttp-gson/modelEnum.mustache | 7 +++++-- .../src/main/resources/Java/modelEnum.mustache | 7 +++++-- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 7 +++++-- .../java-helidon/server/libraries/mp/modelEnum.mustache | 7 +++++-- .../java-micronaut/common/model/modelEnum.mustache | 7 +++++-- 6 files changed, 30 insertions(+), 12 deletions(-) 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 4174fb392385..e3005795d43f 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 @@ -15,7 +15,6 @@ import java.net.URI; {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -76,7 +75,11 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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}} } {{#supportUrlQuery}} 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 f4d69c4f8d12..91720ec60c59 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 @@ -5,7 +5,6 @@ import java.net.URI; {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -59,7 +58,11 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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}} } public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> { diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 3d16414daf23..3bc505bc0b69 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -15,7 +15,6 @@ import java.net.URI; {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -76,7 +75,11 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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}} } {{#gson}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index a180b17ebbc8..5f148c510c70 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonValue; {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -58,7 +57,11 @@ import java.util.Optional; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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}} } {{/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 f4600e87512e..1a4da473db02 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,7 +1,6 @@ {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}} @@ -62,7 +61,11 @@ import java.util.Optional; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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 137a973abdb4..c53e196ce245 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 @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonValue; {{#useEnumCaseInsensitive}}import java.util.Locale; {{/useEnumCaseInsensitive}}import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} @@ -64,6 +63,10 @@ import java.util.Optional; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}}; + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.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}} } } From 6c73574c6b67ca148fa11a2360ed4d86fe65ab39 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 20:42:08 +0100 Subject: [PATCH 15/19] perf: align small enum with current impl --- .../perf/SmallEnumLookupJmhBenchmark.java | 142 +++++++++++++----- 1 file changed, 101 insertions(+), 41 deletions(-) diff --git a/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java b/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java index bc8f8864a541..1c08fc728b9a 100644 --- a/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java +++ b/perf/jmh/src/main/java/org/openapitools/perf/SmallEnumLookupJmhBenchmark.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import java.util.Optional; import java.util.Random; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -66,13 +65,19 @@ public String getValue() { } public static Tiny1 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny1 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny1 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny1 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny1 fromValueLinear(String value) { @@ -124,13 +129,19 @@ public String getValue() { } public static Tiny2 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny2 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny2 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny2 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny2 fromValueLinear(String value) { @@ -183,13 +194,19 @@ public String getValue() { } public static Tiny3 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny3 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny3 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny3 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny3 fromValueLinear(String value) { @@ -243,13 +260,19 @@ public String getValue() { } public static Tiny4 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny4 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny4 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny4 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny4 fromValueLinear(String value) { @@ -304,13 +327,19 @@ public String getValue() { } public static Tiny5 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny5 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny5 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny5 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny5 fromValueLinear(String value) { @@ -366,13 +395,19 @@ public String getValue() { } public static Tiny6 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny6 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny6 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny6 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny6 fromValueLinear(String value) { @@ -429,13 +464,19 @@ public String getValue() { } public static Tiny7 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny7 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny7 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny7 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny7 fromValueLinear(String value) { @@ -493,13 +534,19 @@ public String getValue() { } public static Tiny8 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny8 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny8 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny8 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny8 fromValueLinear(String value) { @@ -558,13 +605,19 @@ public String getValue() { } public static Tiny9 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny9 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny9 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny9 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny9 fromValueLinear(String value) { @@ -624,13 +677,19 @@ public String getValue() { } public static Tiny10 fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CS.get(v)) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny10 result = BY_VALUE_CS.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny10 fromValueCaseInsensitive(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE_CI.get(v.toLowerCase(Locale.ROOT))) - .orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + Tiny10 result = BY_VALUE_CI.get(value.toLowerCase(Locale.ROOT)); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static Tiny10 fromValueLinear(String value) { @@ -696,6 +755,7 @@ private LookupFunctions( Function linear, Function linearCaseInsensitive) { this.values = values; + // Methods this.hashMap = hashMap; this.hashMapCaseInsensitive = hashMapCaseInsensitive; this.linear = linear; From 539407ea9a5171be36ccf9fa670ec5087f0c5eb9 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 20:42:23 +0100 Subject: [PATCH 16/19] chore: update samples --- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/StringEnumRef.java | 7 +++++-- .../java/org/openapitools/client/model/DataChannel.java | 7 +++++-- .../java/org/openapitools/client/model/DataDirection.java | 7 +++++-- .../main/java/org/openapitools/client/model/FruitType.java | 7 +++++-- .../main/java/org/openapitools/client/model/FruitType.java | 7 +++++-- .../src/main/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/main/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/CodesEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../java/org/openapitools/client/model/NullableEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../java/org/openapitools/client/model/SingleRefType.java | 7 +++++-- .../main/java/org/openapitools/client/model/EnumClass.java | 7 +++++-- .../main/java/org/openapitools/client/model/OuterEnum.java | 7 +++++-- .../openapitools/client/model/OuterEnumDefaultValue.java | 7 +++++-- .../org/openapitools/client/model/OuterEnumInteger.java | 7 +++++-- .../client/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../java/org/openapitools/model/OuterEnumDefaultValue.java | 7 +++++-- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 7 +++++-- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/SingleRefType.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../src/gen/java/org/openapitools/model/EnumClass.java | 7 +++++-- .../src/gen/java/org/openapitools/model/OuterEnum.java | 7 +++++-- .../java/org/openapitools/model/OuterEnumDefaultValue.java | 7 +++++-- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 7 +++++-- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 7 +++++-- .../src/gen/java/org/openapitools/model/SingleRefType.java | 7 +++++-- 174 files changed, 870 insertions(+), 348 deletions(-) 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 c35e02972303..b752274b5f25 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.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 74212f6fc4fe..291582e6a066 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -65,7 +64,11 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 536180e1209e..9f6b08d5f2da 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.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 0ff0449b2e52..15e19a153685 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 e1bbdce3d0d7..e28d7ec3d5ee 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.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 e1bbdce3d0d7..e28d7ec3d5ee 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.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 e1bbdce3d0d7..e28d7ec3d5ee 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets StringEnumRef @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + StringEnumRef result = BY_VALUE.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/DataChannel.java b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/model/DataChannel.java index f7cef7f3c47f..e49d71620ecb 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * The transport-channel @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static DataChannel fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + DataChannel result = BY_VALUE.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 d5894bd8f5b7..5bd0702d6671 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * The direction a message travels @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static DataDirection fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + DataDirection result = BY_VALUE.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 d72249c3a222..b5c2835ad65c 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets FruitType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + FruitType result = BY_VALUE.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 d72249c3a222..b5c2835ad65c 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets FruitType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + FruitType result = BY_VALUE.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 b8676c58f6bb..bae37b22ed9d 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 2ff79e070f20..3e27f40cab2e 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 971cb15e7a68..bee685987e60 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 472b92951922..3bb615f64ebb 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 e52044f4b821..5d73ea8abb30 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 2f34118c8fc9..f5453461ce98 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 5a90faf07749..17c7187d4638 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 9c98328d41d1..228d6a9de8d3 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 85b997b8d5a0..c98205f48730 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 8e791f27faff..7a0554405309 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 9b6672485fbe..3be9c20f09cd 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 0ac1e3510525..45d336715696 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 b036f31d5251..e7dc57592862 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 0ac1e3510525..45d336715696 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 b036f31d5251..e7dc57592862 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 3ca426ad351f..d4bcafe82544 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 b9db9ab467aa..a54047b6b441 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 9385b75d1704..2014b7607136 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 fd480ee8b11b..19e2fe3bc3d2 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 8f5f471c86a8..906741cb66b5 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 ccdfb0b8dda4..cf9c81b69a25 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 4811d1e42345..88b46065f11c 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 e2c44d906847..ef3aa150478d 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 7496fd6a29f6..e5896b054aa3 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 ea6684cb7afe..20c213ac044f 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 6cad8eb3e5cb..427a123616cd 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 253190d5af4f..56b261bf11e5 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 d29a8639de83..654e20fd7e8b 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 5bb4893c293a..9f1bb3373ee6 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 dc780f7183e6..c3f5854e7f30 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 @@ -28,7 +28,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -70,7 +69,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 ab2f37e16095..6152df031498 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static CodesEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + CodesEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 2190f52cfe32..60a182db2d3c 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 584e7849e058..9abadb8d9e66 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 65a8ba6db59c..267ac0f6ff42 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 @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -67,7 +66,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 871feceff6d4..262012bc6b7e 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 @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -67,7 +66,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 2190f52cfe32..60a182db2d3c 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 ffbc29feefb9..482302b23a8e 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -61,7 +60,11 @@ public String toString() { } public static NullableEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + NullableEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + return null; } public static class Adapter extends TypeAdapter { 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 f2c8f8873aae..c2004c4a7e77 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -69,7 +68,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + return null; } public static class Adapter extends TypeAdapter { 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 0ea422dcd8ef..e45103056e55 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 5a20782650c6..78c1a1a16968 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -66,7 +65,11 @@ public String toString() { } public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 eb18bf79acc4..c526345fd2ba 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 @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import com.google.gson.TypeAdapter; import com.google.gson.JsonElement; import com.google.gson.annotations.JsonAdapter; @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 5bcf406e075a..db8ed80dc9b0 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 660992f8079d..3314f97b6821 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 @@ -25,7 +25,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -67,7 +66,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 508985f63e3c..f33931ca84bb 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 @@ -27,7 +27,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -68,7 +67,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 b3764b37132b..18b339987aba 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 @@ -27,7 +27,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -68,7 +67,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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/EnumClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumClass.java index ff2424a32c7c..83c6487c9286 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -71,7 +70,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 3d575eff0c71..346787208821 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -71,7 +70,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 24f4676726fe..9c5be157075c 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -71,7 +70,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 7d18cd574405..a91e28e0ce9c 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -71,7 +70,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 2d67c0e19c1e..fe06dbc997ff 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -71,7 +70,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 08017d54b696..cc5259cce751 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 f53e50e7737a..c0f58ace0234 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 a430686dc1bc..ca2e91060570 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 7d3690b20e1e..c0467ec5d155 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 0559f2013935..6a0e5348f4f7 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 7d3690b20e1e..c0467ec5d155 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 0559f2013935..6a0e5348f4f7 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 7d3690b20e1e..c0467ec5d155 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { } public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 0559f2013935..6a0e5348f4f7 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 @@ -24,7 +24,6 @@ import com.google.gson.stream.JsonWriter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { } public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } public static class Adapter extends TypeAdapter { 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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 9b6672485fbe..3be9c20f09cd 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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/EnumClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumClass.java index d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 d7003575d7f3..c1587cc83886 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6ade1139ec5c..64528759304d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 1e63a21da8c4..5800022505f5 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 a4140e0f27ea..3c64cfdfa2ec 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 6df9e8f888b3..ab9ace0eac4d 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -64,7 +63,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 e9747887aab3..6f3b98319851 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 @@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -62,7 +61,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 e33162c1904b..c944e5b39388 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 6840de371287..8c685a1cdae5 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 ed9aef1f683b..f6deb275a153 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 b91d800cd8a3..014e7fe144a4 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 09cae41c64a1..a95caa0b1336 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 @@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -68,7 +67,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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/EnumClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumClass.java index abf98a3dbb89..af0976f3057d 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 1cbbefedbc1b..cf2140afbd82 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 @@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -66,7 +65,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 a08f71f6dedb..94d1ef029167 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 ff0ccb4c49bc..73de643f1051 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 3897ca39008d..ecd09800b6a8 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 6885c8992a2c..77bf9f791773 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 bf62c9928872..022107fe528d 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 689df60db27d..e085632ddf08 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -63,7 +62,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.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 a08f71f6dedb..94d1ef029167 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 b4d9d02df9e7..c22e6e9bfe09 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 a08f71f6dedb..94d1ef029167 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 b4d9d02df9e7..c22e6e9bfe09 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnum result = BY_VALUE.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 706ad0d55071..e45251eceb0d 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets EnumClass @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + EnumClass result = BY_VALUE.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 4de04eda1d27..a557b97e9be6 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnum @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElse(null); + OuterEnum result = BY_VALUE.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 dd920032647f..59178a77c588 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumDefaultValue @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumDefaultValue result = BY_VALUE.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 4216357d34db..ee623126e4d3 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumInteger @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumInteger result = BY_VALUE.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 8e5b93ca1c48..25d31f23878e 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets OuterEnumIntegerDefaultValue @@ -65,7 +64,11 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + OuterEnumIntegerDefaultValue result = BY_VALUE.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 64e69be55d4f..76a728448ec1 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 @@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Gets or Sets SingleRefType @@ -63,7 +62,11 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - return Optional.ofNullable(value).map(v -> BY_VALUE.get(v)).orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")); + SingleRefType result = BY_VALUE.get(value); + if (result != null) { + return result; + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); } } From 2936c9cc16d25409f237d4927d47f326e2683600 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 21:15:46 +0100 Subject: [PATCH 17/19] fix: add hardening against NPE in caseInsensitive case --- .../src/main/resources/Java/libraries/native/modelEnum.mustache | 2 +- .../resources/Java/libraries/okhttp-gson/modelEnum.mustache | 2 +- .../src/main/resources/Java/modelEnum.mustache | 2 +- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 2 +- .../java-helidon/server/libraries/mp/modelEnum.mustache | 2 +- .../resources/java-micronaut/common/model/modelEnum.mustache | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 e3005795d43f..4694dbbb3fb5 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 @@ -75,7 +75,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } 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 91720ec60c59..fb3d3a9b0a88 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 @@ -58,7 +58,7 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 3bc505bc0b69..989edcac6da1 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -75,7 +75,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 5f148c510c70..04011b62fb21 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -57,7 +57,7 @@ import java.util.Map; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } 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 1a4da473db02..a702c933b09e 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 @@ -61,7 +61,7 @@ import java.util.Map; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } 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 c53e196ce245..5d73f9de0dd6 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 @@ -63,7 +63,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); if (result != null) { return result; } From 57dfc7978bf23e0f6f2fc158ccc8fb89527d653e Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 22:01:26 +0100 Subject: [PATCH 18/19] refactor: rename BY_VALUE maps --- .../resources/Java/libraries/native/modelEnum.mustache | 8 ++++---- .../Java/libraries/okhttp-gson/modelEnum.mustache | 8 ++++---- .../src/main/resources/Java/modelEnum.mustache | 8 ++++---- .../src/main/resources/JavaJaxRS/modelEnum.mustache | 8 ++++---- .../java-helidon/server/libraries/mp/modelEnum.mustache | 8 ++++---- .../java-micronaut/common/model/modelEnum.mustache | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) 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 4694dbbb3fb5..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 @@ -42,15 +42,15 @@ import java.util.Map; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -75,7 +75,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } 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 fb3d3a9b0a88..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 @@ -31,15 +31,15 @@ import com.google.gson.stream.JsonWriter; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -58,7 +58,7 @@ import com.google.gson.stream.JsonWriter; } public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache index 989edcac6da1..194dc38fe35b 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache @@ -42,15 +42,15 @@ import java.util.Map; {{{name}}}({{{value}}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -75,7 +75,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache index 04011b62fb21..07c55ed83d98 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache @@ -25,15 +25,15 @@ import java.util.Map; {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}} {{/gson}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -57,7 +57,7 @@ import java.util.Map; @JsonCreator public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } 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 a702c933b09e..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 @@ -32,15 +32,15 @@ import java.util.Map; {{/enumVars}} {{/allowableValues}} - private static final Map<{{{dataType}}}, {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ import java.util.Map; {{#jackson}}@JsonCreator{{/jackson}} public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } 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 5d73f9de0dd6..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 @@ -30,15 +30,15 @@ import java.util.Map; {{/enumVars}} {{/allowableValues}} - private static final Map<{{{dataType}}}, {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> BY_VALUE = new HashMap<>(); + 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 (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ import java.util.Map; @JsonCreator {{/jackson}} public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) { - {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = {{#useEnumCaseInsensitive}}{{#isString}}value == null ? null : {{/isString}}{{/useEnumCaseInsensitive}}BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}}); + {{{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; } From dd1f1c33017014c5a27b3280fccb60ddf07adf67 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Fri, 20 Feb 2026 22:06:56 +0100 Subject: [PATCH 19/19] chore: update samples --- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/StringEnumRef.java | 8 ++++---- .../java/org/openapitools/client/model/DataChannel.java | 8 ++++---- .../java/org/openapitools/client/model/DataDirection.java | 8 ++++---- .../java/org/openapitools/client/model/FruitType.java | 8 ++++---- .../java/org/openapitools/client/model/FruitType.java | 8 ++++---- .../src/main/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/main/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/CodesEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/NullableEnum.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../java/org/openapitools/client/model/SingleRefType.java | 8 ++++---- .../java/org/openapitools/client/model/EnumClass.java | 8 ++++---- .../java/org/openapitools/client/model/OuterEnum.java | 8 ++++---- .../openapitools/client/model/OuterEnumDefaultValue.java | 8 ++++---- .../org/openapitools/client/model/OuterEnumInteger.java | 8 ++++---- .../client/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../src/gen/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/gen/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../src/gen/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/gen/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../org/openapitools/model/OuterEnumDefaultValue.java | 8 ++++---- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 8 ++++---- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../gen/java/org/openapitools/model/SingleRefType.java | 8 ++++---- .../src/gen/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/gen/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../src/gen/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/gen/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../src/gen/java/org/openapitools/model/EnumClass.java | 8 ++++---- .../src/gen/java/org/openapitools/model/OuterEnum.java | 8 ++++---- .../org/openapitools/model/OuterEnumDefaultValue.java | 8 ++++---- .../gen/java/org/openapitools/model/OuterEnumInteger.java | 8 ++++---- .../openapitools/model/OuterEnumIntegerDefaultValue.java | 8 ++++---- .../gen/java/org/openapitools/model/SingleRefType.java | 8 ++++---- 174 files changed, 696 insertions(+), 696 deletions(-) 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 b752274b5f25..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 @@ -37,15 +37,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 291582e6a066..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 @@ -37,15 +37,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 9f6b08d5f2da..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 @@ -38,15 +38,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 15e19a153685..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 @@ -37,15 +37,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 e28d7ec3d5ee..1add1d0621d3 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 @@ -34,15 +34,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 e28d7ec3d5ee..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 @@ -34,15 +34,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 e28d7ec3d5ee..1add1d0621d3 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 @@ -34,15 +34,15 @@ public enum StringEnumRef { UNCLASSIFIED("unclassified"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (StringEnumRef e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static StringEnumRef fromValue(String value) { - StringEnumRef result = BY_VALUE.get(value); + StringEnumRef result = cacheByValue.get(value); if (result != null) { return result; } 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 e49d71620ecb..66dddd76a4f9 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 @@ -36,15 +36,15 @@ public enum DataChannel { PLANE("PLANE"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (DataChannel e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static DataChannel fromValue(String value) { - DataChannel result = BY_VALUE.get(value); + DataChannel result = cacheByValue.get(value); if (result != null) { return result; } 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 5bd0702d6671..a31b6266692f 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 @@ -32,15 +32,15 @@ public enum DataDirection { OUTGOING("OUTGOING"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (DataDirection e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static DataDirection fromValue(String value) { - DataDirection result = BY_VALUE.get(value); + DataDirection result = cacheByValue.get(value); if (result != null) { return result; } 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 b5c2835ad65c..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 @@ -32,15 +32,15 @@ public enum FruitType { BANANA("BANANA"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (FruitType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - FruitType result = BY_VALUE.get(value); + FruitType result = cacheByValue.get(value); if (result != null) { return result; } 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 b5c2835ad65c..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 @@ -32,15 +32,15 @@ public enum FruitType { BANANA("BANANA"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (FruitType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static FruitType fromValue(String value) { - FruitType result = BY_VALUE.get(value); + FruitType result = cacheByValue.get(value); if (result != null) { return result; } 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 bae37b22ed9d..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 @@ -35,15 +35,15 @@ public enum EnumClass { _EFG("-efg"), _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 3e27f40cab2e..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 @@ -35,15 +35,15 @@ public enum OuterEnum { APPROVED("approved"), DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 bee685987e60..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 3bb615f64ebb..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5d73ea8abb30..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 @@ -37,15 +37,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 f5453461ce98..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 @@ -37,15 +37,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 17c7187d4638..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 @@ -37,15 +37,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 228d6a9de8d3..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 @@ -35,15 +35,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c98205f48730..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 @@ -36,15 +36,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 7a0554405309..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 @@ -36,15 +36,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 3be9c20f09cd..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 45d336715696..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 @@ -36,15 +36,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 e7dc57592862..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 @@ -36,15 +36,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 45d336715696..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 @@ -36,15 +36,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 e7dc57592862..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 @@ -36,15 +36,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 d4bcafe82544..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 @@ -40,15 +40,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 a54047b6b441..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 @@ -40,15 +40,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 2014b7607136..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 @@ -40,15 +40,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 19e2fe3bc3d2..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 @@ -40,15 +40,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 906741cb66b5..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 @@ -40,15 +40,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 cf9c81b69a25..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 @@ -38,15 +38,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 88b46065f11c..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 @@ -38,15 +38,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 ef3aa150478d..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 @@ -38,15 +38,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 e5896b054aa3..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 @@ -38,15 +38,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 20c213ac044f..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 @@ -38,15 +38,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 427a123616cd..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 @@ -40,15 +40,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 56b261bf11e5..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 @@ -40,15 +40,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 654e20fd7e8b..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 @@ -40,15 +40,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 9f1bb3373ee6..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 @@ -40,15 +40,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 c3f5854e7f30..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 @@ -40,15 +40,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -69,7 +69,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6152df031498..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 @@ -37,15 +37,15 @@ public enum CodesEnum { CODE_3("Code 3"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (CodesEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static CodesEnum fromValue(String value) { - CodesEnum result = BY_VALUE.get(value); + CodesEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 60a182db2d3c..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 9abadb8d9e66..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 267ac0f6ff42..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 @@ -39,15 +39,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 262012bc6b7e..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 @@ -39,15 +39,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 60a182db2d3c..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 482302b23a8e..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 @@ -33,15 +33,15 @@ public enum NullableEnum { CUSTOM("custom"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (NullableEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -60,7 +60,7 @@ public String toString() { } public static NullableEnum fromValue(String value) { - NullableEnum result = BY_VALUE.get(value); + NullableEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c2004c4a7e77..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 @@ -41,15 +41,15 @@ public enum OuterEnum { UPPER_CASE_S("S"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -68,7 +68,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 e45103056e55..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 @@ -37,15 +37,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 78c1a1a16968..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 @@ -38,15 +38,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { } public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 c526345fd2ba..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 @@ -37,15 +37,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 db8ed80dc9b0..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 3314f97b6821..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -66,7 +66,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 f33931ca84bb..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 @@ -40,15 +40,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 18b339987aba..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 @@ -40,15 +40,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..becfc70956ab 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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..e67f97286eaa 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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..05e3738d8685 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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..9cdc866032ae 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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..d2f2c836428f 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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..7f0855ee865e 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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..becfc70956ab 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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..e67f97286eaa 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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..05e3738d8685 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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..9cdc866032ae 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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..d2f2c836428f 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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..7f0855ee865e 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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..becfc70956ab 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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..e67f97286eaa 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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..05e3738d8685 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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..9cdc866032ae 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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..d2f2c836428f 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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..7f0855ee865e 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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..becfc70956ab 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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..e67f97286eaa 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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..05e3738d8685 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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..9cdc866032ae 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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..d2f2c836428f 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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..7f0855ee865e 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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 83c6487c9286..8be37d30c702 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 @@ -41,15 +41,15 @@ public enum EnumClass { @XmlEnumValue("(xyz)") _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -70,7 +70,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 346787208821..d9c377f75c3a 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 @@ -41,15 +41,15 @@ public enum OuterEnum { @XmlEnumValue("delivered") DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -70,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 9c5be157075c..08055883ce05 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 @@ -41,15 +41,15 @@ public enum OuterEnumDefaultValue { @XmlEnumValue("delivered") DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -70,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 a91e28e0ce9c..335ebd45aaf5 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 @@ -41,15 +41,15 @@ public enum OuterEnumInteger { @XmlEnumValue("2") NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -70,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 fe06dbc997ff..dbaee1f4dd10 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 @@ -41,15 +41,15 @@ public enum OuterEnumIntegerDefaultValue { @XmlEnumValue("2") NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -70,7 +70,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 cc5259cce751..e249bbe62e84 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 @@ -38,15 +38,15 @@ public enum SingleRefType { @XmlEnumValue("user") USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..becfc70956ab 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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..e67f97286eaa 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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..05e3738d8685 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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..9cdc866032ae 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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..d2f2c836428f 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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..7f0855ee865e 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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c0f58ace0234..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 @@ -36,15 +36,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 ca2e91060570..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 @@ -36,15 +36,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c0467ec5d155..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 6a0e5348f4f7..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c0467ec5d155..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 6a0e5348f4f7..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c0467ec5d155..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 @@ -37,15 +37,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 6a0e5348f4f7..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 @@ -37,15 +37,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { } public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 3be9c20f09cd..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c1587cc83886..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 @@ -34,15 +34,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 64528759304d..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 @@ -34,15 +34,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 5800022505f5..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 @@ -34,15 +34,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 3c64cfdfa2ec..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 @@ -34,15 +34,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 ab9ace0eac4d..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 @@ -34,15 +34,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -63,7 +63,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 6f3b98319851..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 @@ -32,15 +32,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -61,7 +61,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 c944e5b39388..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 @@ -38,15 +38,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 8c685a1cdae5..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 @@ -38,15 +38,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 f6deb275a153..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 @@ -38,15 +38,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 014e7fe144a4..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 @@ -38,15 +38,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 a95caa0b1336..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 @@ -38,15 +38,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -67,7 +67,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 af0976f3057d..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 @@ -36,15 +36,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 cf2140afbd82..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 @@ -36,15 +36,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -65,7 +65,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 94d1ef029167..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 @@ -35,15 +35,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 73de643f1051..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 @@ -35,15 +35,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 ecd09800b6a8..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 @@ -35,15 +35,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 77bf9f791773..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 @@ -35,15 +35,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 022107fe528d..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 @@ -35,15 +35,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 e085632ddf08..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 @@ -33,15 +33,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -62,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; } 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 94d1ef029167..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 @@ -35,15 +35,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 c22e6e9bfe09..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 @@ -35,15 +35,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 94d1ef029167..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 @@ -35,15 +35,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 c22e6e9bfe09..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 @@ -35,15 +35,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 e45251eceb0d..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 @@ -35,15 +35,15 @@ public enum EnumClass { _XYZ_("(xyz)"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (EnumClass e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static EnumClass fromValue(String value) { - EnumClass result = BY_VALUE.get(value); + EnumClass result = cacheByValue.get(value); if (result != null) { return result; } 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 a557b97e9be6..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 @@ -35,15 +35,15 @@ public enum OuterEnum { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnum e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnum fromValue(String value) { - OuterEnum result = BY_VALUE.get(value); + OuterEnum result = cacheByValue.get(value); if (result != null) { return result; } 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 59178a77c588..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 @@ -35,15 +35,15 @@ public enum OuterEnumDefaultValue { DELIVERED("delivered"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (OuterEnumDefaultValue e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumDefaultValue fromValue(String value) { - OuterEnumDefaultValue result = BY_VALUE.get(value); + OuterEnumDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 ee623126e4d3..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 @@ -35,15 +35,15 @@ public enum OuterEnumInteger { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumInteger e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumInteger fromValue(Integer value) { - OuterEnumInteger result = BY_VALUE.get(value); + OuterEnumInteger result = cacheByValue.get(value); if (result != null) { return result; } 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 25d31f23878e..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 @@ -35,15 +35,15 @@ public enum OuterEnumIntegerDefaultValue { NUMBER_2(2); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private Integer value; static { for (OuterEnumIntegerDefaultValue e: values()) { Integer key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -64,7 +64,7 @@ public String toString() { @JsonCreator public static OuterEnumIntegerDefaultValue fromValue(Integer value) { - OuterEnumIntegerDefaultValue result = BY_VALUE.get(value); + OuterEnumIntegerDefaultValue result = cacheByValue.get(value); if (result != null) { return result; } 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 76a728448ec1..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 @@ -33,15 +33,15 @@ public enum SingleRefType { USER("user"); - private static final Map BY_VALUE = new HashMap<>(); + private static final Map cacheByValue = new HashMap<>(); private String value; static { for (SingleRefType e: values()) { String key = e.value; - if (!BY_VALUE.containsKey(key)) { - BY_VALUE.put(key, e); + if (!cacheByValue.containsKey(key)) { + cacheByValue.put(key, e); } } } @@ -62,7 +62,7 @@ public String toString() { @JsonCreator public static SingleRefType fromValue(String value) { - SingleRefType result = BY_VALUE.get(value); + SingleRefType result = cacheByValue.get(value); if (result != null) { return result; }