Skip to content

Commit

Permalink
bugfix-20188: use numeric check to ensure that generated inner enums …
Browse files Browse the repository at this point in the history 
…do not use valueOf factory method for BigDecimals.
  • Loading branch information
@timon-sbr
timon-sbr committed Dec 11, 2024
1 parent b218e23 commit 7d87d50
Show file tree
Hide file tree
Showing 28 changed files with 117 additions and 117 deletions.
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{#withXml}}
@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
{{/withXml}}
{{{name}}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}},
{{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
{{/-last}}{{#-last}};{{/-last}}
{{/enumVars}}
{{/allowableValues}}
Expand Down
8 changes: 4 additions & 4 deletions ...petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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
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
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
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
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 ...es/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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
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 ...les/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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
8 changes: 4 additions & 4 deletions ...store/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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 ...ient/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ public EnumStringRequiredEnum read(final JsonReader jsonReader) throws IOExcepti
*/
@JsonAdapter(EnumIntegerEnum.Adapter.class)
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 @@ -196,9 +196,9 @@ public EnumIntegerEnum read(final JsonReader jsonReader) throws IOException {
*/
@JsonAdapter(EnumNumberEnum.Adapter.class)
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 ...tstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,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 @@ -173,9 +173,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 ...lient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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 ...client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
View file
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
Loading

0 comments on commit 7d87d50

Please sign in to comment.