Skip to content

Commit afcedec

Browse files
davidricodiasdavidricodias
committed
refactor: remove Optional in favor on guard clauses
1 parent ee7cd5d commit afcedec

6 files changed

Lines changed: 30 additions & 12 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/native/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import java.net.URI;
1515
{{#useEnumCaseInsensitive}}import java.util.Locale;
1616
{{/useEnumCaseInsensitive}}import java.util.HashMap;
1717
import java.util.Map;
18-
import java.util.Optional;
1918

2019
/**
2120
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@@ -76,7 +75,11 @@ import java.util.Optional;
7675
@JsonCreator
7776
{{/jackson}}
7877
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
79-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
78+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
79+
if (result != null) {
80+
return result;
81+
}
82+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
8083
}
8184
{{#supportUrlQuery}}
8285

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import java.net.URI;
55
{{#useEnumCaseInsensitive}}import java.util.Locale;
66
{{/useEnumCaseInsensitive}}import java.util.HashMap;
77
import java.util.Map;
8-
import java.util.Optional;
98
import com.google.gson.TypeAdapter;
109
import com.google.gson.JsonElement;
1110
import com.google.gson.annotations.JsonAdapter;
@@ -59,7 +58,11 @@ import com.google.gson.stream.JsonWriter;
5958
}
6059

6160
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
62-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
61+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
62+
if (result != null) {
63+
return result;
64+
}
65+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
6366
}
6467

6568
public static class Adapter extends TypeAdapter<{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}> {

‎modules/openapi-generator/src/main/resources/Java/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import java.net.URI;
1515
{{#useEnumCaseInsensitive}}import java.util.Locale;
1616
{{/useEnumCaseInsensitive}}import java.util.HashMap;
1717
import java.util.Map;
18-
import java.util.Optional;
1918

2019
/**
2120
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@@ -76,7 +75,11 @@ import java.util.Optional;
7675
@JsonCreator
7776
{{/jackson}}
7877
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
79-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
78+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
79+
if (result != null) {
80+
return result;
81+
}
82+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
8083
}
8184
{{#gson}}
8285

‎modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
55
{{#useEnumCaseInsensitive}}import java.util.Locale;
66
{{/useEnumCaseInsensitive}}import java.util.HashMap;
77
import java.util.Map;
8-
import java.util.Optional;
98

109
/**
1110
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@@ -58,7 +57,11 @@ import java.util.Optional;
5857

5958
@JsonCreator
6059
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
61-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
60+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
61+
if (result != null) {
62+
return result;
63+
}
64+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
6265
}
6366
{{/jackson}}
6467
}

‎modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{{#useEnumCaseInsensitive}}import java.util.Locale;
22
{{/useEnumCaseInsensitive}}import java.util.HashMap;
33
import java.util.Map;
4-
import java.util.Optional;
54

65
/**
76
* {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
@@ -62,7 +61,11 @@ import java.util.Optional;
6261

6362
{{#jackson}}@JsonCreator{{/jackson}}
6463
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
65-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
64+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
65+
if (result != null) {
66+
return result;
67+
}
68+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
6669
}
6770
{{#jsonb}}
6871
public static final class Deserializer implements JsonbDeserializer<{{datatypeWithEnum}}> {

‎modules/openapi-generator/src/main/resources/java-micronaut/common/model/modelEnum.mustache‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonValue;
55
{{#useEnumCaseInsensitive}}import java.util.Locale;
66
{{/useEnumCaseInsensitive}}import java.util.HashMap;
77
import java.util.Map;
8-
import java.util.Optional;
98

109
/**
1110
* {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}}
@@ -64,6 +63,10 @@ import java.util.Optional;
6463
@JsonCreator
6564
{{/jackson}}
6665
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
67-
return Optional.ofNullable(value).map(v -> {{#useEnumCaseInsensitive}}{{#isString}}BY_VALUE.get(v.toLowerCase(Locale.ROOT)){{/isString}}{{^isString}}BY_VALUE.get(v){{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}BY_VALUE.get(v){{/useEnumCaseInsensitive}}).{{#isNullable}}orElse(null){{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}orElse({{{name}}}){{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}orElseThrow(() -> new IllegalArgumentException("Unexpected value '" + value + "'")){{/enumUnknownDefaultCase}}{{/isNullable}};
66+
{{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} result = BY_VALUE.get({{#useEnumCaseInsensitive}}{{#isString}}value.toLowerCase(Locale.ROOT){{/isString}}{{^isString}}value{{/isString}}{{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}value{{/useEnumCaseInsensitive}});
67+
if (result != null) {
68+
return result;
69+
}
70+
{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}{{#enumUnknownDefaultCase}}{{#allowableValues}}{{#enumVars}}{{#-last}}return {{{name}}};{{/-last}}{{/enumVars}}{{/allowableValues}}{{/enumUnknownDefaultCase}}{{^enumUnknownDefaultCase}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/enumUnknownDefaultCase}}{{/isNullable}}
6871
}
6972
}

0 commit comments

Comments
 (0)