Skip to content

[Java] fix invalid valueOf() usage in enum templates #24838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jorgerod wants to merge 15 commits into
base: master
Choose a base branch
from
+165 −165
Open

[Java] fix invalid valueOf() usage in enum templates #24838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7a786c3
[Java] fix invalid `valueOf()` usage in enum templates
jorgerod Sep 2, 2026
c7eb5cf
[Java] regenerate samples after enum parameter changes
jorgerod Sep 2, 2026
67c64a7
[Java] regenerate okhttp-gson API test
jorgerod Sep 2, 2026
81e82ab
[Crystal] fix incompatible Ameba development version
jorgerod Sep 2, 2026
bca631a
[Java] skip valueOf() for UUID enums, revert out-of-scope Crystal change
jorgerod Sep 2, 2026
1fa96d4
Merge branch 'master' into issue-20188-java-fix-inner-enum-template-v3
jorgerod Sep 2, 2026
99d1678
[Java] fix compile errors for numeric/free-form enums with jsonb and …
jorgerod Sep 3, 2026
3d93f7b
Merge branch 'master' into issue-20188-java-fix-inner-enum-template-v3
jorgerod Sep 3, 2026
48721f4
Merge branch 'master' into issue-20188-java-fix-inner-enum-template-v3
jorgerod Sep 24, 2026
f550b94
refactor: update enum parameters for consistency
jorgerod Sep 24, 2026
d1b5e51
refactor: scope enum template fix to RestClient/RestTemplate/WebClient
jorgerod Sep 24, 2026
e4891dd
refactor: simplify enum value comparisons
jorgerod Sep 24, 2026
9649358
refactor: simplify enum value comparison logic
jorgerod Sep 24, 2026
d8937bd
fix: repair fromValue parenthesis rendering in modelEnum template
jorgerod Sep 24, 2026
cb6e17c
refactor: simplify value comparison in fromValue methods
jorgerod Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ import java.net.URI;
{{/jackson}}
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
if (b.value.equals{{#isString}}{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}{{/isString}}(value)) {
if ({{#isString}}b.value.equals{{#useEnumCaseInsensitive}}IgnoreCase{{/useEnumCaseInsensitive}}(value){{/isString}}{{^isString}}{{^isNumber}}b.value.equals(value){{/isNumber}}{{#isNumber}}{{#isFreeFormObject}}b.value.equals(value){{/isFreeFormObject}}{{^isFreeFormObject}}value != null && b.value.compareTo(value) == 0{{/isFreeFormObject}}{{/isNumber}}{{/isString}}) {
return b;
}
}
Expand Down Expand Up @@ -100,7 +100,7 @@ import java.net.URI;
public static final class Serializer implements JsonbSerializer<{{datatypeWithEnum}}> {
@Override
public void serialize({{datatypeWithEnum}} obj, JsonGenerator generator, SerializationContext ctx) {
generator.write(obj.value);
generator.write({{#isFreeFormObject}}String.valueOf(obj.value){{/isFreeFormObject}}{{^isFreeFormObject}}obj.value{{/isFreeFormObject}});
}
}
{{/jsonb}}
Expand Down
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{#withXml}}
@XmlEnumValue({{#lambda.javaStringLiteral}}{{{rawValue}}}{{/lambda.javaStringLiteral}})
{{/withXml}}
{{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
{{{name}}}({{^isUri}}{{^isUuid}}{{^isNumeric}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUuid}}{{/isUri}}{{{value}}}{{^isUri}}{{^isUuid}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{/isUuid}}{{/isUri}}){{^-last}},
Comment thread
jorgerod marked this conversation as resolved.
{{/-last}}{{#-last}};{{/-last}}
{{/enumVars}}
{{/allowableValues}}
Expand Down Expand Up @@ -51,7 +51,7 @@
{{/jackson}}
public static {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue({{{dataType}}} value) {
for ({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
if ({{#isString}}{{#useEnumCaseInsensitive}}b.value{{#dataFormat}}.toString(){{/dataFormat}}.equalsIgnoreCase({{#dataFormat}}value == null ? null : value.toString(){{/dataFormat}}{{^dataFormat}}value{{/dataFormat}}){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}b.value.equals(value){{/useEnumCaseInsensitive}}{{/isString}}{{^isString}}b.value.equals(value){{/isString}}) {
if ({{#isString}}{{#useEnumCaseInsensitive}}b.value{{#dataFormat}}.toString(){{/dataFormat}}.equalsIgnoreCase({{#dataFormat}}value == null ? null : value.toString(){{/dataFormat}}{{^dataFormat}}value{{/dataFormat}}){{/useEnumCaseInsensitive}}{{^useEnumCaseInsensitive}}b.value.equals(value){{/useEnumCaseInsensitive}}{{/isString}}{{^isString}}{{#isNumber}}{{#isFreeFormObject}}b.value.equals(value){{/isFreeFormObject}}{{^isFreeFormObject}}value != null && b.value.compareTo(value) == 0{{/isFreeFormObject}}{{/isNumber}}{{^isNumber}}b.value.equals(value){{/isNumber}}{{/isString}}) {
return b;
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@
public static final class Serializer implements JsonbSerializer<{{datatypeWithEnum}}> {
@Override
public void serialize({{datatypeWithEnum}} obj, JsonGenerator generator, SerializationContext ctx) {
generator.write(obj.value);
generator.write({{#isFreeFormObject}}String.valueOf(obj.value){{/isFreeFormObject}}{{^isFreeFormObject}}obj.value{{/isFreeFormObject}});
}
}
{{/jsonb}}
Expand Down
8 changes: 4 additions & 4 deletions ...java/apache-httpclient-jackson3/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -175,9 +175,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions ...petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -175,9 +175,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions .../client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions ...petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -167,9 +167,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions ...petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -162,9 +162,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions ...ava/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
8 changes: 4 additions & 4 deletions ...ent/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
12 changes: 6 additions & 6 deletions .../petstore/java/jersey3-jackson3/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(Integer.valueOf(2)),
NUMBER_2(2),

NUMBER_MINUS_2(Integer.valueOf(-2));
NUMBER_MINUS_2(-2);

private Integer value;

Expand Down Expand Up @@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
12 changes: 6 additions & 6 deletions ...es/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(Integer.valueOf(2)),
NUMBER_2(2),

NUMBER_MINUS_2(Integer.valueOf(-2));
NUMBER_MINUS_2(-2);

private Integer value;

Expand Down Expand Up @@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
12 changes: 6 additions & 6 deletions ...ient/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -178,9 +178,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(Integer.valueOf(2)),
NUMBER_2(2),

NUMBER_MINUS_2(Integer.valueOf(-2));
NUMBER_MINUS_2(-2);

private Integer value;

Expand Down Expand Up @@ -217,9 +217,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
12 changes: 6 additions & 6 deletions ...t/petstore/java/native-jackson3/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
* Gets or Sets enumInteger
*/
public enum EnumIntegerEnum {
NUMBER_1(Integer.valueOf(1)),
NUMBER_1(1),

NUMBER_MINUS_1(Integer.valueOf(-1));
NUMBER_MINUS_1(-1);

private Integer value;

Expand Down Expand Up @@ -176,9 +176,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
* Gets or Sets enumIntegerOnly
*/
public enum EnumIntegerOnlyEnum {
NUMBER_2(Integer.valueOf(2)),
NUMBER_2(2),

NUMBER_MINUS_2(Integer.valueOf(-2));
NUMBER_MINUS_2(-2);

private Integer value;

Expand Down Expand Up @@ -215,9 +215,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
* Gets or Sets enumNumber
*/
public enum EnumNumberEnum {
NUMBER_1_DOT_1(Double.valueOf(1.1)),
NUMBER_1_DOT_1(1.1),

NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
NUMBER_MINUS_1_DOT_2(-1.2);

private Double value;

Expand Down
Loading
Loading