From 7d87d50d8907e38b0010ddaa8cd1aa7a9540b0f4 Mon Sep 17 00:00:00 2001 From: Timon Link Date: Wed, 11 Dec 2024 13:53:38 +0100 Subject: [PATCH 001/108] bugfix-20188: use numeric check to ensure that generated inner enums do not use valueOf factory method for BigDecimals. --- .../src/main/resources/Java/modelInnerEnum.mustache | 2 +- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------ .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------ .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------ .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 8 ++++---- .../java/org/openapitools/client/model/EnumTest.java | 12 ++++++------ 28 files changed, 117 insertions(+), 117 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache index f875240996b3..48b49ecff542 100644 --- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache @@ -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}} diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java index da8586607db2..041170157607 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java index 2301e8fd6db1..ed0881d28d70 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java index bc4c9156c2c8..3a5313b7dbf2 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java index 7056c1fe6f17..a4b06cc62375 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java index 5bc0186abdf2..c569dbe738b6 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java index 5bc0186abdf2..c569dbe738b6 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java index bbdb97eafd11..17f5371f4be7 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; @@ -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; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java index 00f3c70332d9..cafc34f1d4cb 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; @@ -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; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java index 21df7ad3edeb..f95da430dceb 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; @@ -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; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java index 3b3703002540..3ce661afccdd 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java index 1607734ae0d2..6fc9bab5880b 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java index 2cc97b1a582a..5ca677cfe11b 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java index c59ee53a528e..c8696355532c 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java index c59ee53a528e..c8696355532c 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java index 148fe53d536e..382834a7ffca 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java index 34e77f98c05f..d3c1004dcb2c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java @@ -155,10 +155,10 @@ public static EnumStringRequiredEnum fromValue(String value) { @XmlEnum(Integer.class) public enum EnumIntegerEnum { @XmlEnumValue("1") - NUMBER_1(Integer.valueOf(1)), + NUMBER_1(1), @XmlEnumValue("-1") - NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_MINUS_1(-1); private Integer value; @@ -199,10 +199,10 @@ public static EnumIntegerEnum fromValue(Integer value) { @XmlEnum(Double.class) public enum EnumNumberEnum { @XmlEnumValue("1.1") - NUMBER_1_DOT_1(Double.valueOf(1.1)), + NUMBER_1_DOT_1(1.1), @XmlEnumValue("-1.2") - NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_MINUS_1_DOT_2(-1.2); private Double value; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java index dccb75274f16..6106c2b0a2e7 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java index dfc3aef715d0..c0368bd8e048 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java @@ -125,9 +125,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; @@ -164,9 +164,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; diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java index 9d96c16b6ef2..ec5524ac24b9 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -141,9 +141,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; @@ -193,9 +193,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; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java index 9d96c16b6ef2..ec5524ac24b9 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -141,9 +141,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; @@ -193,9 +193,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; diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java index 9d96c16b6ef2..ec5524ac24b9 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java @@ -141,9 +141,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; @@ -193,9 +193,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; diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java index 7056c1fe6f17..a4b06cc62375 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java index 148fe53d536e..382834a7ffca 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java index c59ee53a528e..c8696355532c 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java index 2b76dde8df67..edd5a9b750b7 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java index 148fe53d536e..382834a7ffca 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java index bd9760a10e43..58b36dd2154a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java @@ -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; @@ -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; @@ -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; From fffb0e850cccaeb2696af51d2cb6894736127e06 Mon Sep 17 00:00:00 2001 From: Timon Link Date: Tue, 17 Dec 2024 09:34:48 +0100 Subject: [PATCH 002/108] bugfix-20188: Add test data to fake Api in petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml --- ...points-models-for-testing-okhttp-gson.yaml | 29 ++++++ .../java/okhttp-gson/api/openapi.yaml | 29 ++++++ .../AllOfModelArrayAnyOfAllOfAttributesC.md | 10 +++ .../petstore/java/okhttp-gson/docs/FakeApi.md | 8 +- .../petstore/java/okhttp-gson/docs/Order.md | 10 +++ .../org/openapitools/client/api/FakeApi.java | 34 +++++-- .../AllOfModelArrayAnyOfAllOfAttributesC.java | 1 + .../org/openapitools/client/model/Order.java | 88 ++++++++++++++++++- 8 files changed, 196 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml index fa56ab5043cf..0e700e8d22b6 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml @@ -681,6 +681,23 @@ paths: - '-efg' - (xyz) default: '-efg' + enum_form_integer: + description: Form parameter enum test (integer) + type: integer + enum: + - 1 + - -1 + - 0 + default: 1 + enum_form_double: + description: Form parameter enum test (double) + type: double + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + default: 1.1 post: tags: - fake @@ -1558,6 +1575,18 @@ components: complete: type: boolean default: false + paymentMethod: + type: number + format: int32 + description: "Various payment methods" + default: 1 + example: 1 + x-enum-description: + - Paypal + - Creditcard + enum: + - 1 + - 2 xml: name: Order Category: diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index c20e25778928..fdf2306b1874 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -1597,6 +1597,7 @@ components: example: petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2020-02-02T20:20:20.000222Z complete: false @@ -1625,6 +1626,18 @@ components: complete: default: false type: boolean + paymentMethod: + default: 1 + description: Various payment methods + enum: + - 1 + - 2 + example: 1 + format: int32 + type: number + x-enum-description: + - Paypal + - Creditcard type: object xml: name: Order @@ -2913,6 +2926,22 @@ components: - -efg - (xyz) type: string + enum_form_integer: + default: 1 + description: Form parameter enum test (integer) + enum: + - 1 + - -1 + - 0 + type: integer + enum_form_double: + description: Form parameter enum test (double) + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + type: double type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md b/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md index 5229de89b299..f94d7753cfb0 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md +++ b/samples/client/petstore/java/okhttp-gson/docs/AllOfModelArrayAnyOfAllOfAttributesC.md @@ -17,6 +17,7 @@ |**quantity** | **Integer** | | [optional] | |**shipDate** | **OffsetDateTime** | | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -30,3 +31,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index eb2f76491a83..b031ec7edd76 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -982,7 +982,7 @@ null (empty response body) # **testEnumParameters** -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -1011,8 +1011,10 @@ public class Example { Double enumQueryDouble = 1.1D; // Double | Query parameter enum test (double) List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) + Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) + Double enumFormDouble = 1.1D; // Double | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1036,6 +1038,8 @@ public class Example { | **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | [**Double**](Double.md)| Form parameter enum test (double) | [optional] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java/okhttp-gson/docs/Order.md b/samples/client/petstore/java/okhttp-gson/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/Order.md +++ b/samples/client/petstore/java/okhttp-gson/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 26fa4abab65e..98cfd44d411e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2108,6 +2108,8 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl * @param enumQueryDouble Query parameter enum test (double) (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -2119,7 +2121,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl 404 Not found - */ - public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2152,6 +2154,14 @@ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, S localVarFormParams.put("enum_form_string", enumFormString); } + if (enumFormInteger != null) { + localVarFormParams.put("enum_form_integer", enumFormInteger); + } + + if (enumFormDouble != null) { + localVarFormParams.put("enum_form_double", enumFormDouble); + } + if (enumQueryStringArray != null) { localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray)); } @@ -2198,8 +2208,8 @@ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, S } @SuppressWarnings("rawtypes") - private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { - return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, _callback); + private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { + return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); } @@ -2214,6 +2224,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade * @param enumQueryDouble Query parameter enum test (double) (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2223,8 +2235,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade
404 Not found -
*/ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble) throws ApiException { + testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** @@ -2238,6 +2250,8 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryDouble Query parameter enum test (double) (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2248,8 +2262,8 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe 404 Not found - */ - public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString) throws ApiException { - okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, null); + public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble) throws ApiException { + okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null); return localVarApiClient.execute(localVarCall); } @@ -2264,6 +2278,8 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS * @param enumQueryDouble Query parameter enum test (double) (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -2275,9 +2291,9 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS 404 Not found - */ - public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, _callback); + okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java index a5585c1cd9b0..adb01b58045d 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributesC.java @@ -20,6 +20,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; +import java.math.BigDecimal; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Arrays; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java index 1013694c0c6c..c110cb8a129e 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java @@ -20,6 +20,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import java.io.IOException; +import java.math.BigDecimal; import java.time.OffsetDateTime; import java.util.Arrays; @@ -135,6 +136,63 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti @javax.annotation.Nullable private Boolean complete = false; + /** + * Various payment methods + */ + @JsonAdapter(PaymentMethodEnum.Adapter.class) + public enum PaymentMethodEnum { + NUMBER_1(new BigDecimal("1")), + + NUMBER_2(new BigDecimal("2")); + + private BigDecimal value; + + PaymentMethodEnum(BigDecimal value) { + this.value = value; + } + + public BigDecimal getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static PaymentMethodEnum fromValue(BigDecimal value) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final PaymentMethodEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public PaymentMethodEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return PaymentMethodEnum.fromValue(new BigDecimal(value)); + } + } + + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + String value = jsonElement.getAsString(); + PaymentMethodEnum.fromValue(new BigDecimal(value)); + } + } + + public static final String SERIALIZED_NAME_PAYMENT_METHOD = "paymentMethod"; + @SerializedName(SERIALIZED_NAME_PAYMENT_METHOD) + @javax.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + public Order() { } @@ -251,6 +309,25 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) { this.complete = complete; } + + public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @javax.annotation.Nullable + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + /** * A container for additional, undeclared properties. * This is a holder for any undeclared properties as specified with @@ -311,13 +388,14 @@ public boolean equals(Object o) { Objects.equals(this.quantity, order.quantity) && Objects.equals(this.shipDate, order.shipDate) && Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete)&& + Objects.equals(this.complete, order.complete) && + Objects.equals(this.paymentMethod, order.paymentMethod)&& Objects.equals(this.additionalProperties, order.additionalProperties); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete, additionalProperties); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, additionalProperties); } @Override @@ -330,6 +408,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -359,6 +438,7 @@ private String toIndentedString(Object o) { openapiFields.add("shipDate"); openapiFields.add("status"); openapiFields.add("complete"); + openapiFields.add("paymentMethod"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); @@ -384,6 +464,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { StatusEnum.validateJsonElement(jsonObj.get("status")); } + // validate the optional field `paymentMethod` + if (jsonObj.get("paymentMethod") != null && !jsonObj.get("paymentMethod").isJsonNull()) { + PaymentMethodEnum.validateJsonElement(jsonObj.get("paymentMethod")); + } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { From a8d3e7da44e268d32818e6d02d0a111d58f7bbea Mon Sep 17 00:00:00 2001 From: Timon Link Date: Tue, 17 Dec 2024 09:53:34 +0100 Subject: [PATCH 003/108] bugfix-20188: Fix compilation error in FakeApiTest.java --- .../test/java/org/openapitools/client/api/FakeApiTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java index 9a44aacd233a..609fc9f0a40f 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -220,7 +220,9 @@ public void testEnumParametersTest() throws ApiException { Double enumQueryDouble = null; List enumFormStringArray = null; String enumFormString = null; - api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + Integer enumFormInteger = null; + Double enumFormDouble = null; + api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); // TODO: test validations } From 22e48e00dbd24aea86155c84dd683a6ac31675ef Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 28 Jan 2025 14:04:19 +0100 Subject: [PATCH 004/108] apply to more libraries, improve test --- .../libraries/microprofile/enumClass.mustache | 2 +- .../okhttp-gson/modelInnerEnum.mustache | 2 +- ...points-models-for-testing-okhttp-gson.yaml | 2 +- ...ith-fake-endpoints-models-for-testing.yaml | 29 ++++++++ .../java/okhttp-gson/api/openapi.yaml | 3 +- .../petstore/java/okhttp-gson/docs/FakeApi.md | 4 +- .../org/openapitools/client/api/FakeApi.java | 18 ++--- .../openapitools/client/model/EnumArrays.java | 8 +- .../client/model/EnumStringDiscriminator.java | 4 +- .../openapitools/client/model/EnumTest.java | 12 +-- .../openapitools/client/model/MapTest.java | 4 +- .../org/openapitools/client/model/NewPet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../client/model/PetComposition.java | 6 +- .../org/openapitools/client/model/PetRef.java | 6 +- .../client/model/PetUsingAllOf.java | 6 +- .../client/model/PetWithRequiredTags.java | 6 +- .../org/openapitools/client/model/Zebra.java | 6 +- .../petstore/java/resteasy/api/openapi.yaml | 30 ++++++++ .../petstore/java/resteasy/docs/FakeApi.md | 8 +- .../petstore/java/resteasy/docs/Order.md | 10 +++ .../org/openapitools/client/api/FakeApi.java | 8 +- .../org/openapitools/client/model/Order.java | 74 ++++++++++++++++++- 24 files changed, 207 insertions(+), 59 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache index 7cead92c5394..675f1222c5a1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache @@ -15,7 +15,7 @@ {{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} {{/withXml}} {{^withXml}} - {{#enumVars}}{{name}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} + {{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}){{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} {{/withXml}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache index 06912e9b1ef7..ea1774d0c2b4 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache @@ -17,7 +17,7 @@ {{#withXml}} @XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{/withXml}} - {{{name}}}({{{value}}}){{^-last}}, + {{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml index 0e700e8d22b6..e85988fa5a56 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml @@ -691,7 +691,7 @@ paths: default: 1 enum_form_double: description: Form parameter enum test (double) - type: double + type: number enum: - 1.1 - -1.1 diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml index e4957b4e19d1..7092e29ce33f 100644 --- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml @@ -710,6 +710,23 @@ paths: - '-efg' - (xyz) default: '-efg' + enum_form_integer: + description: Form parameter enum test (integer) + type: integer + enum: + - 1 + - -1 + - 0 + default: 1 + enum_form_double: + description: Form parameter enum test (double) + type: number + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + default: 1.1 post: tags: - fake @@ -1417,6 +1434,18 @@ components: complete: type: boolean default: false + paymentMethod: + type: number + format: int32 + description: "Various payment methods" + default: 1 + example: 1 + x-enum-description: + - Paypal + - Creditcard + enum: + - 1 + - 2 xml: name: Order Category: diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index fdf2306b1874..8b42afd92246 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -2935,13 +2935,14 @@ components: - 0 type: integer enum_form_double: + default: 1.1 description: Form parameter enum test (double) enum: - 1.1 - -1.1 - 0.1 - 0.0 - type: double + type: number type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index b031ec7edd76..90eb140aac25 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -1012,7 +1012,7 @@ public class Example { List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) - Double enumFormDouble = 1.1D; // Double | Form parameter enum test (double) + BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { @@ -1039,7 +1039,7 @@ public class Example { | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | | **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | -| **enumFormDouble** | [**Double**](Double.md)| Form parameter enum test (double) | [optional] [enum: 1.1, -1.1, 0.1, 0.0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index 98cfd44d411e..b12f8cb5d873 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2109,7 +2109,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -2121,7 +2121,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl 404 Not found - */ - public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2208,7 +2208,7 @@ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, S } @SuppressWarnings("rawtypes") - private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { + private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); } @@ -2225,7 +2225,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2235,7 +2235,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade
404 Not found -
*/ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble) throws ApiException { + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } @@ -2251,7 +2251,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2262,7 +2262,7 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe 404 Not found - */ - public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble) throws ApiException { + public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null); return localVarApiClient.execute(localVarCall); } @@ -2279,7 +2279,7 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -2291,7 +2291,7 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS 404 Not found - */ - public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, Double enumFormDouble, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); localVarApiClient.executeAsync(localVarCall, _callback); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java index ca3ae11696eb..942a3676a979 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -57,9 +57,9 @@ public class EnumArrays { */ @JsonAdapter(JustSymbolEnum.Adapter.class) public enum JustSymbolEnum { - GREATER_THAN_OR_EQUAL_TO(">="), + GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")), - DOLLAR("$"); + DOLLAR(String.valueOf("$")); private String value; @@ -114,9 +114,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti */ @JsonAdapter(ArrayEnumEnum.Adapter.class) public enum ArrayEnumEnum { - FISH("fish"), + FISH(String.valueOf("fish")), - CRAB("crab"); + CRAB(String.valueOf("crab")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java index 19640f513a0c..8026872c4836 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java @@ -55,9 +55,9 @@ public class EnumStringDiscriminator { */ @JsonAdapter(EnumStrTypeEnum.Adapter.class) public enum EnumStrTypeEnum { - A("type_a"), + A(String.valueOf("type_a")), - B("type_b"); + B(String.valueOf("type_b")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java index f9e7be9eb427..385acf9553c2 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -60,11 +60,11 @@ public class EnumTest { */ @JsonAdapter(EnumStringEnum.Adapter.class) public enum EnumStringEnum { - UPPER("UPPER"), + UPPER(String.valueOf("UPPER")), - LOWER("lower"), + LOWER(String.valueOf("lower")), - EMPTY(""); + EMPTY(String.valueOf("")); private String value; @@ -119,11 +119,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti */ @JsonAdapter(EnumStringRequiredEnum.Adapter.class) public enum EnumStringRequiredEnum { - UPPER("UPPER"), + UPPER(String.valueOf("UPPER")), - LOWER("lower"), + LOWER(String.valueOf("lower")), - EMPTY(""); + EMPTY(String.valueOf("")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java index 4062389689ff..01294cc0fd7f 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java @@ -62,9 +62,9 @@ public class MapTest { */ @JsonAdapter(InnerEnum.Adapter.class) public enum InnerEnum { - UPPER("UPPER"), + UPPER(String.valueOf("UPPER")), - LOWER("lower"); + LOWER(String.valueOf("lower")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java index 9c61b972c8d5..bc33500cc401 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java @@ -110,11 +110,11 @@ public class NewPet { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java index c110cb8a129e..8f24a0d4ccdf 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java @@ -77,11 +77,11 @@ public class Order { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - PLACED("placed"), + PLACED(String.valueOf("placed")), - APPROVED("approved"), + APPROVED(String.valueOf("approved")), - DELIVERED("delivered"); + DELIVERED(String.valueOf("delivered")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index 9e5344d81271..6a7a5a1ec4bc 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -84,11 +84,11 @@ public class Pet { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java index 46f196e1aab6..20dd3c894e9d 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java @@ -84,11 +84,11 @@ public class PetComposition { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java index a07231acd3d5..162dacb47c5a 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java @@ -84,11 +84,11 @@ public class PetRef { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java index 149f5f10cf40..090bc3e3bc93 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java @@ -84,11 +84,11 @@ public class PetUsingAllOf { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java index 801ff4ddafbc..5ae71f2c23f6 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java @@ -84,11 +84,11 @@ public class PetWithRequiredTags { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java index 90634754d634..bdd3ea1ba6ba 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java @@ -55,11 +55,11 @@ public class Zebra { */ @JsonAdapter(TypeEnum.Adapter.class) public enum TypeEnum { - PLAINS("plains"), + PLAINS(String.valueOf("plains")), - MOUNTAIN("mountain"), + MOUNTAIN(String.valueOf("mountain")), - GREVYS("grevys"); + GREVYS(String.valueOf("grevys")); private String value; diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml index 1eddf878948c..cb7df8763a22 100644 --- a/samples/client/petstore/java/resteasy/api/openapi.yaml +++ b/samples/client/petstore/java/resteasy/api/openapi.yaml @@ -1438,6 +1438,7 @@ components: example: petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1466,18 @@ components: complete: default: false type: boolean + paymentMethod: + default: 1 + description: Various payment methods + enum: + - 1 + - 2 + example: 1 + format: int32 + type: number + x-enum-description: + - Paypal + - Creditcard type: object xml: name: Order @@ -2217,6 +2230,23 @@ components: - -efg - (xyz) type: string + enum_form_integer: + default: 1 + description: Form parameter enum test (integer) + enum: + - 1 + - -1 + - 0 + type: integer + enum_form_double: + default: 1.1 + description: Form parameter enum test (double) + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + type: number type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/resteasy/docs/FakeApi.md +++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md @@ -976,7 +976,7 @@ null (empty response body) ## testEnumParameters -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -1007,8 +1007,10 @@ public class Example { List enumQueryModelArray = Arrays.asList(-efg); // List | List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) + Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) + BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1034,6 +1036,8 @@ public class Example { | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java/resteasy/docs/Order.md b/samples/client/petstore/java/resteasy/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java/resteasy/docs/Order.md +++ b/samples/client/petstore/java/resteasy/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java index 2f01b568f9b8..790b7c5b05f4 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java @@ -692,9 +692,11 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @throws ApiException if fails to make API call */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws ApiException { + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -722,6 +724,10 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe localVarFormParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) localVarFormParams.put("enum_form_string", enumFormString); +if (enumFormInteger != null) + localVarFormParams.put("enum_form_integer", enumFormInteger); +if (enumFormDouble != null) + localVarFormParams.put("enum_form_double", enumFormDouble); final String[] localVarAccepts = { diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java index 7597f3281a0e..bfa6889ceacc 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,7 +34,8 @@ Order.JSON_PROPERTY_QUANTITY, Order.JSON_PROPERTY_SHIP_DATE, Order.JSON_PROPERTY_STATUS, - Order.JSON_PROPERTY_COMPLETE + Order.JSON_PROPERTY_COMPLETE, + Order.JSON_PROPERTY_PAYMENT_METHOD }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0-SNAPSHOT") public class Order { @@ -98,6 +100,45 @@ public static StatusEnum fromValue(String value) { @javax.annotation.Nullable private Boolean complete = false; + /** + * Various payment methods + */ + public enum PaymentMethodEnum { + NUMBER_1(new BigDecimal("1")), + + NUMBER_2(new BigDecimal("2")); + + private BigDecimal value; + + PaymentMethodEnum(BigDecimal value) { + this.value = value; + } + + @JsonValue + public BigDecimal getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static PaymentMethodEnum fromValue(BigDecimal value) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod"; + @javax.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + public Order() { } @@ -251,6 +292,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -265,12 +331,13 @@ public boolean equals(Object o) { Objects.equals(this.quantity, order.quantity) && Objects.equals(this.shipDate, order.shipDate) && Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); + Objects.equals(this.complete, order.complete) && + Objects.equals(this.paymentMethod, order.paymentMethod); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod); } @Override @@ -283,6 +350,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } From 54ef454198df33d495313bc1f80883394a4ed7f9 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Tue, 28 Jan 2025 17:50:42 +0100 Subject: [PATCH 005/108] don't trigger unrelated problem --- ...points-models-for-testing-okhttp-gson.yaml | 9 ------- .../java/okhttp-gson/api/openapi.yaml | 9 ------- .../petstore/java/okhttp-gson/docs/FakeApi.md | 6 ++--- .../org/openapitools/client/api/FakeApi.java | 26 +++++++------------ .../openapitools/client/api/FakeApiTest.java | 4 +-- 5 files changed, 12 insertions(+), 42 deletions(-) diff --git a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml index e85988fa5a56..13e5329e5523 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml @@ -689,15 +689,6 @@ paths: - -1 - 0 default: 1 - enum_form_double: - description: Form parameter enum test (double) - type: number - enum: - - 1.1 - - -1.1 - - 0.1 - - 0.0 - default: 1.1 post: tags: - fake diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index 8b42afd92246..9939b5dba3e5 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -2934,15 +2934,6 @@ components: - -1 - 0 type: integer - enum_form_double: - default: 1.1 - description: Form parameter enum test (double) - enum: - - 1.1 - - -1.1 - - 0.1 - - 0.0 - type: number type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md index 90eb140aac25..0181d0b4dd20 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md +++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md @@ -982,7 +982,7 @@ null (empty response body) # **testEnumParameters** -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger) To test enum parameters @@ -1012,9 +1012,8 @@ public class Example { List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) - BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1039,7 +1038,6 @@ public class Example { | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | | **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | -| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java index b12f8cb5d873..7e81db28af00 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -2109,7 +2109,6 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -2121,7 +2120,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl 404 Not found - */ - public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2158,10 +2157,6 @@ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, S localVarFormParams.put("enum_form_integer", enumFormInteger); } - if (enumFormDouble != null) { - localVarFormParams.put("enum_form_double", enumFormDouble); - } - if (enumQueryStringArray != null) { localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray)); } @@ -2208,8 +2203,8 @@ public okhttp3.Call testEnumParametersCall(List enumHeaderStringArray, S } @SuppressWarnings("rawtypes") - private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { - return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); + private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback _callback) throws ApiException { + return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback); } @@ -2225,7 +2220,6 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2235,8 +2229,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List enumHeade
404 Not found -
*/ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { - testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger) throws ApiException { + testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger); } /** @@ -2251,7 +2245,6 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2262,8 +2255,8 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe 404 Not found - */ - public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { - okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null); + public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger) throws ApiException { + okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, null); return localVarApiClient.execute(localVarCall); } @@ -2279,7 +2272,6 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) - * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -2291,9 +2283,9 @@ public ApiResponse testEnumParametersWithHttpInfo(List enumHeaderS 404 Not found - */ - public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersAsync(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback); + okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java index 609fc9f0a40f..9a44aacd233a 100644 --- a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java @@ -220,9 +220,7 @@ public void testEnumParametersTest() throws ApiException { Double enumQueryDouble = null; List enumFormStringArray = null; String enumFormString = null; - Integer enumFormInteger = null; - Double enumFormDouble = null; - api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); + api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); // TODO: test validations } From 6c641d80d9fa8d113a5d8cbecc74b8063acacc99 Mon Sep 17 00:00:00 2001 From: Martin <2026226+martin-mfg@users.noreply.github.com> Date: Wed, 29 Jan 2025 08:55:05 +0100 Subject: [PATCH 006/108] update all samples --- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../client/model/DefaultValue.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Query.java | 6 +- .../openapitools/client/model/SomeObj.java | 2 +- .../java-helidon-client/v3/mp/docs/FakeApi.md | 4 +- .../java-helidon-client/v3/mp/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/model/Order.java | 48 ++ .../java-helidon-client/v3/se/docs/FakeApi.md | 8 +- .../java-helidon-client/v3/se/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 16 +- .../org/openapitools/client/model/Order.java | 48 ++ .../java-helidon-client/v4/mp/docs/FakeApi.md | 4 +- .../java-helidon-client/v4/mp/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 2 +- .../org/openapitools/client/model/Order.java | 48 ++ .../java-helidon-client/v4/se/docs/FakeApi.md | 8 +- .../java-helidon-client/v4/se/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 16 +- .../org/openapitools/client/model/Order.java | 48 ++ .../java/apache-httpclient/api/openapi.yaml | 30 + .../java/apache-httpclient/docs/FakeApi.md | 8 +- .../java/apache-httpclient/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 14 +- .../org/openapitools/client/model/Order.java | 84 ++- .../petstore/java/feign/api/openapi.yaml | 30 + .../org/openapitools/client/api/FakeApi.java | 16 +- .../org/openapitools/client/model/Order.java | 75 +- .../docs/FakeApi.md | 8 +- .../docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 68 +- .../docs/FakeApi.md | 8 +- .../docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 75 +- .../microprofile-rest-client/docs/FakeApi.md | 8 +- .../microprofile-rest-client/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 75 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/BigCat.java | 8 +- .../openapitools/client/model/EnumArrays.java | 8 +- .../openapitools/client/model/EnumTest.java | 12 +- .../openapitools/client/model/MapTest.java | 4 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../model/PetWithRequiredNullableCases1.java | 6 +- .../model/PetWithRequiredNullableCases2.java | 6 +- .../org/openapitools/client/model/BigCat.java | 8 +- .../openapitools/client/model/EnumArrays.java | 8 +- .../openapitools/client/model/EnumTest.java | 12 +- .../openapitools/client/model/MapTest.java | 4 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../org/openapitools/client/model/Order.java | 6 +- .../org/openapitools/client/model/Pet.java | 6 +- .../openapitools/client/ApiClientTest.java | 350 --------- .../org/openapitools/client/ClientTest.java | 70 -- .../client/ConfigurationTest.java | 15 - .../org/openapitools/client/JSONTest.java | 674 ------------------ .../openapitools/client/StringUtilTest.java | 33 - .../client/api/AnotherFakeApiTest.java | 62 +- .../client/api/DefaultApiTest.java | 35 + .../openapitools/client/api/FakeApiTest.java | 47 +- .../api/FakeClassnameTags123ApiTest.java | 27 +- .../openapitools/client/api/PetApiTest.java | 594 --------------- .../openapitools/client/api/StoreApiTest.java | 39 +- .../openapitools/client/api/UserApiTest.java | 62 +- .../client/auth/ApiKeyAuthTest.java | 119 ---- .../client/auth/HttpBasicAuthTest.java | 65 -- .../client/auth/RetryingOAuthTest.java | 124 ---- .../model/AdditionalPropertiesClassTest.java | 2 +- ...OfModelArrayAnyOfAllOfAttributesCTest.java | 9 + .../model/AllOfModelArrayAnyOfTest.java | 9 + .../openapitools/client/model/AnimalTest.java | 4 +- .../client/model/AppleReqTest.java | 2 +- .../openapitools/client/model/AppleTest.java | 2 +- ...neAllOfArrayAllofDogPropertyInnerTest.java | 2 +- .../client/model/ArrayOfInlineAllOfTest.java | 2 +- .../client/model/ArrayOfNumberOnlyTest.java | 2 +- .../client/model/ArrayTestTest.java | 2 +- .../client/model/BananaReqTest.java | 2 +- .../openapitools/client/model/BananaTest.java | 2 +- .../client/model/BasquePigTest.java | 2 +- .../client/model/CapitalizationTest.java | 2 +- .../openapitools/client/model/CatTest.java | 3 +- .../client/model/CategoryTest.java | 2 +- .../client/model/ClassModelTest.java | 2 +- .../openapitools/client/model/ClientTest.java | 2 +- .../model/ComplexQuadrilateralTest.java | 2 +- .../client/model/DanishPigTest.java | 2 +- .../client/model/DeprecatedObjectTest.java | 2 +- .../openapitools/client/model/DogTest.java | 2 +- .../client/model/DrawingTest.java | 2 +- .../client/model/EnumArraysTest.java | 2 +- .../client/model/EnumClassTest.java | 1 - .../model/EnumStringDiscriminatorTest.java | 2 +- .../client/model/EnumTestTest.java | 2 +- .../client/model/EquilateralTriangleTest.java | 2 +- .../client/model/FileSchemaTestClassTest.java | 2 +- .../model/FooGetDefaultResponseTest.java | 2 +- .../openapitools/client/model/FooTest.java | 2 +- .../client/model/FormatTestTest.java | 2 +- .../client/model/FruitReqTest.java | 2 +- .../openapitools/client/model/FruitTest.java | 2 +- .../client/model/GmFruitTest.java | 2 +- .../client/model/GrandparentAnimalTest.java | 3 +- .../client/model/HasOnlyReadOnlyTest.java | 2 +- .../client/model/HealthCheckResultTest.java | 2 +- .../client/model/IsoscelesTriangleTest.java | 2 +- .../openapitools/client/model/MammalTest.java | 2 +- .../client/model/MapTestTest.java | 2 +- ...rtiesAndAdditionalPropertiesClassTest.java | 2 +- .../client/model/Model200ResponseTest.java | 2 +- .../client/model/ModelApiResponseTest.java | 2 +- .../client/model/ModelFileTest.java | 2 +- .../client/model/ModelListTest.java | 2 +- .../client/model/ModelReturnTest.java | 2 +- .../openapitools/client/model/NameTest.java | 2 +- .../openapitools/client/model/NewPetTest.java | 32 + .../client/model/NullableClassTest.java | 2 +- .../client/model/NullableShapeTest.java | 2 +- .../client/model/NumberOnlyTest.java | 2 +- .../model/ObjectWithDeprecatedFieldsTest.java | 2 +- .../openapitools/client/model/OrderTest.java | 11 +- .../client/model/OuterCompositeTest.java | 2 +- .../model/OuterEnumDefaultValueTest.java | 1 - .../OuterEnumIntegerDefaultValueTest.java | 1 - .../client/model/OuterEnumIntegerTest.java | 1 - .../client/model/OuterEnumTest.java | 1 - .../client/model/ParentPetTest.java | 2 +- .../openapitools/client/model/PetRefTest.java | 44 ++ .../openapitools/client/model/PetTest.java | 92 --- .../client/model/PetWithRequiredTagsTest.java | 2 +- .../openapitools/client/model/PigTest.java | 2 +- .../model/QuadrilateralInterfaceTest.java | 2 +- .../client/model/QuadrilateralTest.java | 2 +- .../client/model/ReadOnlyFirstTest.java | 2 +- .../client/model/ScaleneTriangleTest.java | 2 +- .../client/model/ShapeInterfaceTest.java | 2 +- .../client/model/ShapeOrNullTest.java | 2 +- .../openapitools/client/model/ShapeTest.java | 2 +- .../client/model/SimpleQuadrilateralTest.java | 2 +- .../client/model/SpecialModelNameTest.java | 2 +- .../openapitools/client/model/TagTest.java | 2 +- .../client/model/TriangleInterfaceTest.java | 2 +- .../client/model/TriangleTest.java | 2 +- .../openapitools/client/model/UserTest.java | 2 +- .../openapitools/client/model/ValueTest.java | 1 + .../openapitools/client/model/WhaleTest.java | 2 +- .../openapitools/client/model/ZebraTest.java | 2 +- .../java/restclient-swagger2/api/openapi.yaml | 30 + .../java/restclient-swagger2/docs/FakeApi.md | 8 +- .../java/restclient-swagger2/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 26 +- .../org/openapitools/client/model/Order.java | 75 +- .../api/openapi.yaml | 30 + .../docs/FakeApi.md | 8 +- .../docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 36 +- .../org/openapitools/client/model/Order.java | 74 +- .../petstore/java/restclient/api/openapi.yaml | 30 + .../petstore/java/restclient/docs/FakeApi.md | 8 +- .../petstore/java/restclient/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 26 +- .../org/openapitools/client/model/Order.java | 74 +- .../resttemplate-withXml/api/openapi.yaml | 30 + .../java/resttemplate-withXml/docs/FakeApi.md | 8 +- .../java/resttemplate-withXml/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 14 +- .../org/openapitools/client/model/Order.java | 81 ++- .../java/resttemplate/api/openapi.yaml | 30 + .../java/resttemplate/docs/FakeApi.md | 8 +- .../petstore/java/resttemplate/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 14 +- .../org/openapitools/client/model/Order.java | 84 ++- .../petstore/java/vertx/api/openapi.yaml | 30 + .../petstore/java/vertx/docs/FakeApi.md | 8 +- .../client/petstore/java/vertx/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 12 +- .../client/api/rxjava/FakeApi.java | 24 +- .../org/openapitools/client/model/Order.java | 74 +- .../java/webclient-jakarta/api/openapi.yaml | 30 + .../java/webclient-jakarta/docs/FakeApi.md | 8 +- .../java/webclient-jakarta/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 26 +- .../org/openapitools/client/model/Order.java | 74 +- .../java/webclient-swagger2/api/openapi.yaml | 30 + .../java/webclient-swagger2/docs/FakeApi.md | 8 +- .../java/webclient-swagger2/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 26 +- .../org/openapitools/client/model/Order.java | 75 +- .../petstore/java/webclient/api/openapi.yaml | 30 + .../petstore/java/webclient/docs/FakeApi.md | 8 +- .../petstore/java/webclient/docs/Order.md | 10 + .../org/openapitools/client/api/FakeApi.java | 26 +- .../org/openapitools/client/model/Order.java | 74 +- .../petstore/ruby-autoload/docs/FakeApi.md | 6 +- .../petstore/ruby-autoload/docs/Order.md | 4 +- .../lib/petstore/api/fake_api.rb | 14 + .../lib/petstore/models/order.rb | 32 +- .../petstore/ruby-faraday/docs/FakeApi.md | 6 +- .../petstore/ruby-faraday/docs/Order.md | 4 +- .../ruby-faraday/lib/petstore/api/fake_api.rb | 14 + .../ruby-faraday/lib/petstore/models/order.rb | 32 +- .../builds/default-v3.0/apis/FakeApi.ts | 29 + .../builds/default-v3.0/models/Order.ts | 17 + .../doc/FakeApi.md | 8 +- .../doc/Order.md | 1 + .../lib/src/api/fake_api.dart | 4 + .../lib/src/model/order.dart | 43 +- .../petstore_client_lib_fake/doc/FakeApi.md | 8 +- .../petstore_client_lib_fake/doc/Order.md | 1 + .../lib/src/api/fake_api.dart | 6 + .../lib/src/model/order.dart | 43 +- .../petstore_client_lib_fake/doc/FakeApi.md | 8 +- .../petstore_client_lib_fake/doc/Order.md | 1 + .../lib/api/fake_api.dart | 24 +- .../lib/model/order.dart | 88 ++- samples/schema/petstore/mysql/Model/Order.sql | 6 +- .../schema/petstore/mysql/mysql_schema.sql | 3 +- .../cpp-restbed/generated/3_0/api/FakeApi.cpp | 8 +- .../cpp-restbed/generated/3_0/api/FakeApi.h | 6 +- .../cpp-restbed/generated/3_0/model/Order.cpp | 21 + .../cpp-restbed/generated/3_0/model/Order.h | 7 + .../openapitools/server/api/FakeService.java | 2 +- .../server/api/FakeServiceImpl.java | 2 +- .../org/openapitools/server/model/Order.java | 74 ++ .../src/main/resources/META-INF/openapi.yml | 30 + .../org/openapitools/server/model/Order.java | 57 +- .../src/main/resources/META-INF/openapi.yml | 30 + .../openapitools/server/api/FakeService.java | 2 +- .../server/api/FakeServiceImpl.java | 2 +- .../org/openapitools/server/model/Order.java | 74 ++ .../src/main/resources/META-INF/openapi.yml | 30 + .../openapitools/server/api/FakeService.java | 59 +- .../server/api/FakeServiceImpl.java | 4 +- .../org/openapitools/server/model/Order.java | 57 +- .../src/main/resources/META-INF/openapi.yml | 30 + .../openapitools/server/api/FakeService.java | 59 +- .../server/api/FakeServiceImpl.java | 4 +- .../org/openapitools/server/model/Order.java | 57 +- .../src/main/resources/META-INF/openapi.yml | 30 + .../org/openapitools/server/model/Order.java | 57 +- .../src/main/resources/META-INF/openapi.yml | 30 + .../mockserver/api/FakeApiMockServer.java | 24 +- .../mockserver/api/StoreApiMockServer.java | 10 +- .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../java/org/openapitools/model/Order.java | 65 +- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/model/Order.java | 81 ++- .../src/main/resources/META-INF/openapi.yaml | 30 + .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../java/org/openapitools/model/Order.java | 65 +- .../api/impl/FakeApiServiceImpl.java | 2 +- .../app/Http/Controllers/FakeController.php | 4 + .../php-laravel/lib/app/Models/Order.php | 3 + .../lib/app/Http/Controllers/FakeApi.php | 4 + 279 files changed, 3887 insertions(+), 2622 deletions(-) delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/RetryingOAuthTest.java delete mode 100644 samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java index 2d676f418915..45c8a24a6b53 100644 --- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java @@ -76,11 +76,11 @@ public class Order { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - PLACED("placed"), + PLACED(String.valueOf("placed")), - APPROVED("approved"), + APPROVED(String.valueOf("approved")), - DELIVERED("delivered"); + DELIVERED(String.valueOf("delivered")); private String value; diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java index 82d53519d2b7..c130ce3208d4 100644 --- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java @@ -84,11 +84,11 @@ public class Pet { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java index bf41b71a74ad..8fc8d415955b 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -64,11 +64,11 @@ public class DefaultValue { */ @JsonAdapter(ArrayStringEnumDefaultEnum.Adapter.class) public enum ArrayStringEnumDefaultEnum { - SUCCESS("success"), + SUCCESS(String.valueOf("success")), - FAILURE("failure"), + FAILURE(String.valueOf("failure")), - UNCLASSIFIED("unclassified"); + UNCLASSIFIED(String.valueOf("unclassified")); private String value; diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java index a3f157711f8f..42aa6f1924e4 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -84,11 +84,11 @@ public class Pet { */ @JsonAdapter(StatusEnum.Adapter.class) public enum StatusEnum { - AVAILABLE("available"), + AVAILABLE(String.valueOf("available")), - PENDING("pending"), + PENDING(String.valueOf("pending")), - SOLD("sold"); + SOLD(String.valueOf("sold")); private String value; diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java index d4c140b7f0ef..61af452e582c 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java @@ -62,11 +62,11 @@ public class Query { */ @JsonAdapter(OutcomesEnum.Adapter.class) public enum OutcomesEnum { - SUCCESS("SUCCESS"), + SUCCESS(String.valueOf("SUCCESS")), - FAILURE("FAILURE"), + FAILURE(String.valueOf("FAILURE")), - SKIPPED("SKIPPED"); + SKIPPED(String.valueOf("SKIPPED")); private String value; diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java index b6f61f7872eb..a4480c2f2d35 100644 --- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java +++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java @@ -58,7 +58,7 @@ public class SomeObj implements Serializable { */ @JsonAdapter(TypeEnum.Adapter.class) public enum TypeEnum { - SOMEOBJIDENTIFIER("SomeObjIdentifier"); + SOMEOBJIDENTIFIER(String.valueOf("SomeObjIdentifier")); private String value; diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md index 4cdd475689dd..5869ecbd2271 100644 --- a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md @@ -526,7 +526,7 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ## testEnumParameters -> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -546,6 +546,8 @@ To test enum parameters | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md +++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java index fda6b183e193..106181a538f6 100644 --- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java @@ -152,7 +152,7 @@ public interface FakeApi { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException; + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString, @FormParam("enum_form_integer") Integer enumFormInteger, @FormParam("enum_form_double") BigDecimal enumFormDouble) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java index 84ce8e3fa1fb..5aa83727e198 100644 --- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/Order.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; @@ -60,6 +61,32 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2"))); + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + /** * Get id * @return id @@ -180,6 +207,26 @@ public Order complete(Boolean complete) { return this; } + /** + * Various payment methods + * @return paymentMethod + **/ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + /** + * Set paymentMethod + **/ + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +242,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md @@ -976,7 +976,7 @@ null (empty response body) ## testEnumParameters -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -1007,8 +1007,10 @@ public class Example { List enumQueryModelArray = Arrays.asList(-efg); // List | List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) + Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) + BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1034,6 +1036,8 @@ public class Example { | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md +++ b/samples/client/petstore/java-helidon-client/v3/se/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java index a7f954df9a69..c6a18e91f6f4 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java @@ -120,9 +120,11 @@ public interface FakeApi { * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return {@code ApiResponse} */ - ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString); + ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble); /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 8f6e7f539c0c..bfa42aa128c3 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -681,9 +681,9 @@ protected ApiResponse testEndpointParametersSubmit(WebClientRequestBuilder } @Override - public ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { - WebClientRequestBuilder webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); - return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { + WebClientRequestBuilder webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); + return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** @@ -699,9 +699,11 @@ public ApiResponse testEnumParameters(List enumHeaderStringArray, * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return WebClientRequestBuilder for testEnumParameters */ - protected WebClientRequestBuilder testEnumParametersRequestBuilder(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + protected WebClientRequestBuilder testEnumParametersRequestBuilder(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { WebClientRequestBuilder webClientRequestBuilder = apiClient.webClient() .method("GET"); @@ -742,12 +744,16 @@ protected WebClientRequestBuilder testEnumParametersRequestBuilder(List * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return {@code ApiResponse} for the submitted request */ - protected ApiResponse testEnumParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + protected ApiResponse testEnumParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { String formParams = new StringJoiner("&") .add("enum_form_string_array=" + enumFormStringArray) .add("enum_form_string=" + enumFormString) + .add("enum_form_integer=" + enumFormInteger) + .add("enum_form_double=" + enumFormDouble) .toString(); Single webClientResponse = webClientRequestBuilder.submit(formParams); return ApiResponse.create(RESPONSE_TYPE_testEnumParameters, webClientResponse); diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java index 84ce8e3fa1fb..5aa83727e198 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/Order.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; @@ -60,6 +61,32 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2"))); + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + /** * Get id * @return id @@ -180,6 +207,26 @@ public Order complete(Boolean complete) { return this; } + /** + * Various payment methods + * @return paymentMethod + **/ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + /** + * Set paymentMethod + **/ + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +242,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md index 4cdd475689dd..5869ecbd2271 100644 --- a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md @@ -526,7 +526,7 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン ## testEnumParameters -> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> void testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -546,6 +546,8 @@ To test enum parameters | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md +++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java index 62cc34c3e484..03f8812d5737 100644 --- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java @@ -153,7 +153,7 @@ public interface FakeApi { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString) throws ApiException, ProcessingException; + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @QueryParam("enum_query_model_array") List enumQueryModelArray, @FormParam("enum_form_string_array") List enumFormStringArray, @FormParam("enum_form_string") String enumFormString, @FormParam("enum_form_integer") Integer enumFormInteger, @FormParam("enum_form_double") BigDecimal enumFormDouble) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java index 84ce8e3fa1fb..5aa83727e198 100644 --- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/Order.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; @@ -60,6 +61,32 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2"))); + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + /** * Get id * @return id @@ -180,6 +207,26 @@ public Order complete(Boolean complete) { return this; } + /** + * Various payment methods + * @return paymentMethod + **/ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + /** + * Set paymentMethod + **/ + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +242,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md +++ b/samples/client/petstore/java-helidon-client/v4/se/docs/FakeApi.md @@ -976,7 +976,7 @@ null (empty response body) ## testEnumParameters -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -1007,8 +1007,10 @@ public class Example { List enumQueryModelArray = Arrays.asList(-efg); // List | List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) + Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) + BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1034,6 +1036,8 @@ public class Example { | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md +++ b/samples/client/petstore/java-helidon-client/v4/se/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java index 54def85a491c..cd0cdbe96c1b 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApi.java @@ -121,9 +121,11 @@ public interface FakeApi { * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return {@code ApiResponse} */ - ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString); + ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble); /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java index de72f948f8fe..571b8d0cb7cf 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -683,9 +683,9 @@ protected ApiResponse testEndpointParametersSubmit(HttpClientRequest webCl } @Override - public ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { - HttpClientRequest webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); - return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ApiResponse testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { + HttpClientRequest webClientRequestBuilder = testEnumParametersRequestBuilder(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); + return testEnumParametersSubmit(webClientRequestBuilder, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** @@ -701,9 +701,11 @@ public ApiResponse testEnumParameters(List enumHeaderStringArray, * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return HttpClientRequest for testEnumParameters */ - protected HttpClientRequest testEnumParametersRequestBuilder(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + protected HttpClientRequest testEnumParametersRequestBuilder(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { HttpClientRequest webClientRequestBuilder = apiClient.webClient() .method(Method.GET); @@ -744,12 +746,16 @@ protected HttpClientRequest testEnumParametersRequestBuilder(List enumHe * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @return {@code ApiResponse} for the submitted request */ - protected ApiResponse testEnumParametersSubmit(HttpClientRequest webClientRequestBuilder, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + protected ApiResponse testEnumParametersSubmit(HttpClientRequest webClientRequestBuilder, List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { String formParams = new StringJoiner("&") .add("enum_form_string_array=" + enumFormStringArray) .add("enum_form_string=" + enumFormString) + .add("enum_form_integer=" + enumFormInteger) + .add("enum_form_double=" + enumFormDouble) .toString(); HttpClientResponse webClientResponse = webClientRequestBuilder.submit(formParams); return ApiResponse.create(RESPONSE_TYPE_testEnumParameters, webClientResponse); diff --git a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java index 84ce8e3fa1fb..5aa83727e198 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/Order.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; @@ -60,6 +61,32 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2"))); + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + /** * Get id * @return id @@ -180,6 +207,26 @@ public Order complete(Boolean complete) { return this; } + /** + * Various payment methods + * @return paymentMethod + **/ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + /** + * Set paymentMethod + **/ + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +242,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml index 1eddf878948c..cb7df8763a22 100644 --- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml @@ -1438,6 +1438,7 @@ components: example: petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1466,18 @@ components: complete: default: false type: boolean + paymentMethod: + default: 1 + description: Various payment methods + enum: + - 1 + - 2 + example: 1 + format: int32 + type: number + x-enum-description: + - Paypal + - Creditcard type: object xml: name: Order @@ -2217,6 +2230,23 @@ components: - -efg - (xyz) type: string + enum_form_integer: + default: 1 + description: Form parameter enum test (integer) + enum: + - 1 + - -1 + - 0 + type: integer + enum_form_double: + default: 1.1 + description: Form parameter enum test (double) + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + type: number type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md +++ b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md @@ -976,7 +976,7 @@ null (empty response body) ## testEnumParameters -> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble) To test enum parameters @@ -1007,8 +1007,10 @@ public class Example { List enumQueryModelArray = Arrays.asList(-efg); // List | List enumFormStringArray = Arrays.asList("$"); // List | Form parameter enum test (string array) String enumFormString = "_abc"; // String | Form parameter enum test (string) + Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer) + BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); System.err.println("Status code: " + e.getCode()); @@ -1034,6 +1036,8 @@ public class Example { | **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] | | **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] | | **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] | +| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] | +| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] | ### Return type diff --git a/samples/client/petstore/java/apache-httpclient/docs/Order.md b/samples/client/petstore/java/apache-httpclient/docs/Order.md index 27af32855c5c..b25552d366d9 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/Order.md +++ b/samples/client/petstore/java/apache-httpclient/docs/Order.md @@ -13,6 +13,7 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | @@ -26,3 +27,12 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java index 0cb43629ac79..e9678c08cd7d 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1135,10 +1135,12 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @throws ApiException if fails to make API call */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws ApiException { - this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, Collections.emptyMap()); + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException { + this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, Collections.emptyMap()); } @@ -1154,10 +1156,12 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param additionalHeaders additionalHeaders for this call * @throws ApiException if fails to make API call */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Map additionalHeaders) throws ApiException { + public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -1188,6 +1192,10 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe localVarFormParams.put("enum_form_string_array", enumFormStringArray); if (enumFormString != null) localVarFormParams.put("enum_form_string", enumFormString); +if (enumFormInteger != null) + localVarFormParams.put("enum_form_integer", enumFormInteger); +if (enumFormDouble != null) + localVarFormParams.put("enum_form_double", enumFormDouble); final String[] localVarAccepts = { diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java index 0844fb3806ee..615fd7908cb6 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -36,7 +37,8 @@ Order.JSON_PROPERTY_QUANTITY, Order.JSON_PROPERTY_SHIP_DATE, Order.JSON_PROPERTY_STATUS, - Order.JSON_PROPERTY_COMPLETE + Order.JSON_PROPERTY_COMPLETE, + Order.JSON_PROPERTY_PAYMENT_METHOD }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0-SNAPSHOT") public class Order { @@ -101,6 +103,45 @@ public static StatusEnum fromValue(String value) { @javax.annotation.Nullable private Boolean complete = false; + /** + * Various payment methods + */ + public enum PaymentMethodEnum { + NUMBER_1(new BigDecimal("1")), + + NUMBER_2(new BigDecimal("2")); + + private BigDecimal value; + + PaymentMethodEnum(BigDecimal value) { + this.value = value; + } + + @JsonValue + public BigDecimal getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static PaymentMethodEnum fromValue(BigDecimal value) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_PAYMENT_METHOD = "paymentMethod"; + @javax.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + public Order() { } @@ -254,6 +295,31 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -268,12 +334,13 @@ public boolean equals(Object o) { Objects.equals(this.quantity, order.quantity) && Objects.equals(this.shipDate, order.shipDate) && Objects.equals(this.status, order.status) && - Objects.equals(this.complete, order.complete); + Objects.equals(this.complete, order.complete) && + Objects.equals(this.paymentMethod, order.paymentMethod); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod); } @Override @@ -286,6 +353,7 @@ public String toString() { sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" complete: ").append(toIndentedString(complete)).append("\n"); + sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n"); sb.append("}"); return sb.toString(); } @@ -393,6 +461,16 @@ public String toUrlQueryString(String prefix) { } } + // add `paymentMethod` to the URL query string + if (getPaymentMethod() != null) { + try { + joiner.add(String.format("%spaymentMethod%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getPaymentMethod()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + return joiner.toString(); } diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index 1eddf878948c..cb7df8763a22 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -1438,6 +1438,7 @@ components: example: petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1466,18 @@ components: complete: default: false type: boolean + paymentMethod: + default: 1 + description: Various payment methods + enum: + - 1 + - 2 + example: 1 + format: int32 + type: number + x-enum-description: + - Paypal + - Creditcard type: object xml: name: Order @@ -2217,6 +2230,23 @@ components: - -efg - (xyz) type: string + enum_form_integer: + default: 1 + description: Form parameter enum test (integer) + enum: + - 1 + - -1 + - 0 + type: integer + enum_form_double: + default: 1.1 + description: Form parameter enum test (double) + enum: + - 1.1 + - -1.1 + - 0.1 + - 0.0 + type: number type: object testEndpointParameters_request: properties: diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java index 38b40eca0fea..13d03a6ae3f1 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java @@ -570,6 +570,8 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) */ @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}") @Headers({ @@ -579,7 +581,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "enum_header_string: {enumHeaderString}" }) - void testEnumParameters(@Param("enumHeaderStringArray") List enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumQueryModelArray") List enumQueryModelArray, @Param("enum_form_string_array") List enumFormStringArray, @Param("enum_form_string") String enumFormString); + void testEnumParameters(@Param("enumHeaderStringArray") List enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumQueryModelArray") List enumQueryModelArray, @Param("enum_form_string_array") List enumFormStringArray, @Param("enum_form_string") String enumFormString, @Param("enum_form_integer") Integer enumFormInteger, @Param("enum_form_double") BigDecimal enumFormDouble); /** * To test enum parameters @@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param enumQueryModelArray (optional) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) */ @RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}") @Headers({ @@ -603,7 +607,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { "enum_header_string: {enumHeaderString}" }) - ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") List enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumQueryModelArray") List enumQueryModelArray, @Param("enum_form_string_array") List enumFormStringArray, @Param("enum_form_string") String enumFormString); + ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") List enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumQueryModelArray") List enumQueryModelArray, @Param("enum_form_string_array") List enumFormStringArray, @Param("enum_form_string") String enumFormString, @Param("enum_form_integer") Integer enumFormInteger, @Param("enum_form_double") BigDecimal enumFormDouble); /** @@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(final String value) { * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg) * @param enumFormStringArray Form parameter enum test (string array) (optional) * @param enumFormString Form parameter enum test (string) (optional, default to -efg) + * @param enumFormInteger Form parameter enum test (integer) (optional, default to 1) + * @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1) * @param queryParams Map of query parameters as name-value pairs *

The following elements may be specified in the query map:

*