Skip to content

Commit 0d6669e

Browse files
timon-sbrtimon-sbr
committed
bugfix-20188: use numeric check to ensure that generated inner enums do not use valueOf factory method for BigDecimals.
1 parent b929970 commit 0d6669e

File tree

28 files changed

+117
-117
lines changed
  • modules/openapi-generator/src/main/resources/Java
  • samples
    • client/petstore/java
      • apache-httpclient/src/main/java/org/openapitools/client/model
      • feign-no-nullable/src/main/java/org/openapitools/client/model
      • feign/src/main/java/org/openapitools/client/model
      • google-api-client/src/main/java/org/openapitools/client/model
      • jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model
      • jersey2-java8/src/main/java/org/openapitools/client/model
      • jersey3/src/main/java/org/openapitools/client/model
      • native-async/src/main/java/org/openapitools/client/model
      • native/src/main/java/org/openapitools/client/model
      • rest-assured-jackson/src/main/java/org/openapitools/client/model
      • rest-assured/src/main/java/org/openapitools/client/model
      • restclient-swagger2/src/main/java/org/openapitools/client/model
      • restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model
      • restclient/src/main/java/org/openapitools/client/model
      • resteasy/src/main/java/org/openapitools/client/model
      • resttemplate-withXml/src/main/java/org/openapitools/client/model
      • resttemplate/src/main/java/org/openapitools/client/model
      • retrofit2-play26/src/main/java/org/openapitools/client/model
      • retrofit2rx2/src/main/java/org/openapitools/client/model
      • retrofit2rx3/src/main/java/org/openapitools/client/model
      • retrofit2/src/main/java/org/openapitools/client/model
      • vertx-no-nullable/src/main/java/org/openapitools/client/model
      • vertx/src/main/java/org/openapitools/client/model
      • webclient-jakarta/src/main/java/org/openapitools/client/model
      • webclient-swagger2/src/main/java/org/openapitools/client/model
      • webclient/src/main/java/org/openapitools/client/model
    • openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model

28 files changed

+117
-117
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{#withXml}}
2424
@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
2525
{{/withXml}}
26-
{{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
26+
{{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
2727
{{/-last}}{{#-last}};{{/-last}}
2828
{{/enumVars}}
2929
{{/allowableValues}}

‎samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
136136
* Gets or Sets enumInteger
137137
*/
138138
public enum EnumIntegerEnum {
139-
NUMBER_1(Integer.valueOf(1)),
139+
NUMBER_1(1),
140140

141-
NUMBER_MINUS_1(Integer.valueOf(-1));
141+
NUMBER_MINUS_1(-1);
142142

143143
private Integer value;
144144

@@ -175,9 +175,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
175175
* Gets or Sets enumNumber
176176
*/
177177
public enum EnumNumberEnum {
178-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
178+
NUMBER_1_DOT_1(1.1),
179179

180-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
180+
NUMBER_MINUS_1_DOT_2(-1.2);
181181

182182
private Double value;
183183

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
128128
* Gets or Sets enumInteger
129129
*/
130130
public enum EnumIntegerEnum {
131-
NUMBER_1(Integer.valueOf(1)),
131+
NUMBER_1(1),
132132

133-
NUMBER_MINUS_1(Integer.valueOf(-1));
133+
NUMBER_MINUS_1(-1);
134134

135135
private Integer value;
136136

@@ -167,9 +167,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
167167
* Gets or Sets enumNumber
168168
*/
169169
public enum EnumNumberEnum {
170-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
170+
NUMBER_1_DOT_1(1.1),
171171

172-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
172+
NUMBER_MINUS_1_DOT_2(-1.2);
173173

174174
private Double value;
175175

‎samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
133133
* Gets or Sets enumInteger
134134
*/
135135
public enum EnumIntegerEnum {
136-
NUMBER_1(Integer.valueOf(1)),
136+
NUMBER_1(1),
137137

138-
NUMBER_MINUS_1(Integer.valueOf(-1));
138+
NUMBER_MINUS_1(-1);
139139

140140
private Integer value;
141141

@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
172172
* Gets or Sets enumNumber
173173
*/
174174
public enum EnumNumberEnum {
175-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
175+
NUMBER_1_DOT_1(1.1),
176176

177-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
177+
NUMBER_MINUS_1_DOT_2(-1.2);
178178

179179
private Double value;
180180

‎samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
123123
* Gets or Sets enumInteger
124124
*/
125125
public enum EnumIntegerEnum {
126-
NUMBER_1(Integer.valueOf(1)),
126+
NUMBER_1(1),
127127

128-
NUMBER_MINUS_1(Integer.valueOf(-1));
128+
NUMBER_MINUS_1(-1);
129129

130130
private Integer value;
131131

@@ -162,9 +162,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
162162
* Gets or Sets enumNumber
163163
*/
164164
public enum EnumNumberEnum {
165-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
165+
NUMBER_1_DOT_1(1.1),
166166

167-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
167+
NUMBER_MINUS_1_DOT_2(-1.2);
168168

169169
private Double value;
170170

‎samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
126126
* Gets or Sets enumInteger
127127
*/
128128
public enum EnumIntegerEnum {
129-
NUMBER_1(Integer.valueOf(1)),
129+
NUMBER_1(1),
130130

131-
NUMBER_MINUS_1(Integer.valueOf(-1));
131+
NUMBER_MINUS_1(-1);
132132

133133
private Integer value;
134134

@@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
165165
* Gets or Sets enumNumber
166166
*/
167167
public enum EnumNumberEnum {
168-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
168+
NUMBER_1_DOT_1(1.1),
169169

170-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
170+
NUMBER_MINUS_1_DOT_2(-1.2);
171171

172172
private Double value;
173173

‎samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
126126
* Gets or Sets enumInteger
127127
*/
128128
public enum EnumIntegerEnum {
129-
NUMBER_1(Integer.valueOf(1)),
129+
NUMBER_1(1),
130130

131-
NUMBER_MINUS_1(Integer.valueOf(-1));
131+
NUMBER_MINUS_1(-1);
132132

133133
private Integer value;
134134

@@ -165,9 +165,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
165165
* Gets or Sets enumNumber
166166
*/
167167
public enum EnumNumberEnum {
168-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
168+
NUMBER_1_DOT_1(1.1),
169169

170-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
170+
NUMBER_MINUS_1_DOT_2(-1.2);
171171

172172
private Double value;
173173

‎samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
141141
* Gets or Sets enumInteger
142142
*/
143143
public enum EnumIntegerEnum {
144-
NUMBER_1(Integer.valueOf(1)),
144+
NUMBER_1(1),
145145

146-
NUMBER_MINUS_1(Integer.valueOf(-1));
146+
NUMBER_MINUS_1(-1);
147147

148148
private Integer value;
149149

@@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
180180
* Gets or Sets enumIntegerOnly
181181
*/
182182
public enum EnumIntegerOnlyEnum {
183-
NUMBER_2(Integer.valueOf(2)),
183+
NUMBER_2(2),
184184

185-
NUMBER_MINUS_2(Integer.valueOf(-2));
185+
NUMBER_MINUS_2(-2);
186186

187187
private Integer value;
188188

@@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
219219
* Gets or Sets enumNumber
220220
*/
221221
public enum EnumNumberEnum {
222-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
222+
NUMBER_1_DOT_1(1.1),
223223

224-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
224+
NUMBER_MINUS_1_DOT_2(-1.2);
225225

226226
private Double value;
227227

‎samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
139139
* Gets or Sets enumInteger
140140
*/
141141
public enum EnumIntegerEnum {
142-
NUMBER_1(Integer.valueOf(1)),
142+
NUMBER_1(1),
143143

144-
NUMBER_MINUS_1(Integer.valueOf(-1));
144+
NUMBER_MINUS_1(-1);
145145

146146
private Integer value;
147147

@@ -178,9 +178,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
178178
* Gets or Sets enumIntegerOnly
179179
*/
180180
public enum EnumIntegerOnlyEnum {
181-
NUMBER_2(Integer.valueOf(2)),
181+
NUMBER_2(2),
182182

183-
NUMBER_MINUS_2(Integer.valueOf(-2));
183+
NUMBER_MINUS_2(-2);
184184

185185
private Integer value;
186186

@@ -217,9 +217,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
217217
* Gets or Sets enumNumber
218218
*/
219219
public enum EnumNumberEnum {
220-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
220+
NUMBER_1_DOT_1(1.1),
221221

222-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
222+
NUMBER_MINUS_1_DOT_2(-1.2);
223223

224224
private Double value;
225225

‎samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
141141
* Gets or Sets enumInteger
142142
*/
143143
public enum EnumIntegerEnum {
144-
NUMBER_1(Integer.valueOf(1)),
144+
NUMBER_1(1),
145145

146-
NUMBER_MINUS_1(Integer.valueOf(-1));
146+
NUMBER_MINUS_1(-1);
147147

148148
private Integer value;
149149

@@ -180,9 +180,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
180180
* Gets or Sets enumIntegerOnly
181181
*/
182182
public enum EnumIntegerOnlyEnum {
183-
NUMBER_2(Integer.valueOf(2)),
183+
NUMBER_2(2),
184184

185-
NUMBER_MINUS_2(Integer.valueOf(-2));
185+
NUMBER_MINUS_2(-2);
186186

187187
private Integer value;
188188

@@ -219,9 +219,9 @@ public static EnumIntegerOnlyEnum fromValue(Integer value) {
219219
* Gets or Sets enumNumber
220220
*/
221221
public enum EnumNumberEnum {
222-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
222+
NUMBER_1_DOT_1(1.1),
223223

224-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
224+
NUMBER_MINUS_1_DOT_2(-1.2);
225225

226226
private Double value;
227227

0 commit comments

Comments
 (0)