From 4a113260157938f08beda9f29588fc29554821e2 Mon Sep 17 00:00:00 2001 From: davidricodias Date: Mon, 16 Feb 2026 22:03:40 +0100 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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); }