Skip to content

Commit d7b3d93

Browse files
committed
issue-20188: apply isFreeFromObject and isUri to more enum templates
1 parent 5cb9f0c commit d7b3d93

File tree

35 files changed

+53
-53
lines changed

35 files changed

+53
-53
lines changed

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
66
77
{{#allowableValues}}
8-
{{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
8+
{{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
99
{{/allowableValues}}
1010

1111
{{dataType}} value;

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
66
77
{{#allowableValues}}
8-
{{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
8+
{{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
99
{{/allowableValues}}
1010

1111
{{dataType}} value;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} {
22
33
{{#allowableValues}}
4-
{{#enumVars}}{{name}}({{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{{value}}}{{^isNumeric}}){{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
4+
{{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
55
{{/allowableValues}}
66

77

samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String toString() {
8989

9090
public enum OrderStatusEnum {
9191

92-
PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
92+
PENDING("PENDING"), PROCESSING("PROCESSING");
9393

9494
Object value;
9595

samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String toString() {
8989

9090
public enum OrderStatusEnum {
9191

92-
PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
92+
PENDING("PENDING"), PROCESSING("PROCESSING");
9393

9494
Object value;
9595

samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String toString() {
8989

9090
public enum OrderStatusEnum {
9191

92-
PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
92+
PENDING("PENDING"), PROCESSING("PROCESSING");
9393

9494
Object value;
9595

samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public String toString() {
8989

9090
public enum OrderStatusEnum {
9191

92-
PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING"));
92+
PENDING("PENDING"), PROCESSING("PROCESSING");
9393

9494
Object value;
9595

samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class EnumArrays {
3636

3737
public enum JustSymbolEnum {
3838

39-
GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
39+
GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), DOLLAR(String.valueOf("$"));
4040

4141

4242
String value;
@@ -72,7 +72,7 @@ public static JustSymbolEnum fromValue(String value) {
7272

7373
public enum ArrayEnumEnum {
7474

75-
FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
75+
FISH(String.valueOf("fish")), CRAB(String.valueOf("crab"));
7676

7777

7878
String value;

samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class EnumTest {
4444

4545
public enum EnumStringEnum {
4646

47-
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
47+
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
4848

4949

5050
String value;
@@ -80,7 +80,7 @@ public static EnumStringEnum fromValue(String value) {
8080

8181
public enum EnumStringRequiredEnum {
8282

83-
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
83+
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower")), EMPTY(String.valueOf(""));
8484

8585

8686
String value;
@@ -116,7 +116,7 @@ public static EnumStringRequiredEnum fromValue(String value) {
116116

117117
public enum EnumIntegerEnum {
118118

119-
NUMBER_1(1), NUMBER_MINUS_1(-1);
119+
NUMBER_1(1), NUMBER_MINUS_1(-1);
120120

121121

122122
Integer value;
@@ -152,7 +152,7 @@ public static EnumIntegerEnum fromValue(Integer value) {
152152

153153
public enum EnumNumberEnum {
154154

155-
NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
155+
NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2);
156156

157157

158158
Double value;

samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/MapTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class MapTest {
4141

4242
public enum InnerEnum {
4343

44-
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
44+
UPPER(String.valueOf("UPPER")), LOWER(String.valueOf("lower"));
4545

4646

4747
String value;

0 commit comments

Comments
 (0)