From 6fae3c3ebf27065113cf91b0424b59764b818413 Mon Sep 17 00:00:00 2001 From: DrGrill0r Date: Fri, 29 Aug 2025 16:59:32 +0200 Subject: [PATCH 1/2] issue-20188:fix inner enum template --- .../libraries/microprofile/enumClass.mustache | 2 +- .../okhttp-gson/modelInnerEnum.mustache | 2 +- .../resources/Java/modelInnerEnum.mustache | 2 +- .../client/libraries/mp/enumClass.mustache | 2 +- .../client/libraries/se/enumClass.mustache | 2 +- .../server/libraries/mp/enumClass.mustache | 2 +- ...points-models-for-testing-okhttp-gson.yaml | 20 +++++++++++ ...ith-fake-endpoints-models-for-testing.yaml | 36 +++++++++++++++++++ 8 files changed, 62 insertions(+), 6 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 9315b9c9d974..eaccbf3b7f42 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}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/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 d21f03c3c5e0..19c68ff602e7 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}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache index 401002a697b3..cc5fa874aeb0 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}}{{^isFreeFormObject}}{{dataType}}.valueOf({{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}{{^isFreeFormObject}}){{/isFreeFormObject}}{{/isNumeric}}{{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache index d32efebf489d..0b843941b2a1 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/enumClass.mustache @@ -5,7 +5,7 @@ {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} { {{#allowableValues}} - {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} + {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} {{/allowableValues}} {{dataType}} value; diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache index d32efebf489d..0b843941b2a1 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/enumClass.mustache @@ -5,7 +5,7 @@ {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} { {{#allowableValues}} - {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} + {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} {{/allowableValues}} {{dataType}} value; diff --git a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache index 1b67dadb3601..be0e4d16ef2b 100644 --- a/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache +++ b/modules/openapi-generator/src/main/resources/java-helidon/server/libraries/mp/enumClass.mustache @@ -1,7 +1,7 @@ {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}} { {{#allowableValues}} - {{#enumVars}}{{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}} + {{#enumVars}}{{name}}({{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}{{dataType}}.valueOf({{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}{{{value}}}{{^isNumeric}}{{^isFreeFormObject}}{{^isUri}}){{/isUri}}{{/isFreeFormObject}}{{/isNumeric}}){{^-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 4d44d00b329e..48c78bb899e5 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,14 @@ paths: - '-efg' - (xyz) default: '-efg' + enum_form_integer: + description: Form parameter enum test (integer) + type: integer + enum: + - 1 + - -1 + - 0 + default: 1 post: tags: - fake @@ -1558,6 +1566,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/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..e4d034586ab2 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,25 @@ 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 + OrderStatus: + type: string + description: Order status + additionalProperties: false + enum: + - PENDING + - PROCESSING xml: name: Order Category: From 81d0655762ebc57c37113e85497762a80e66d474 Mon Sep 17 00:00:00 2001 From: DrGrill0r Date: Fri, 29 Aug 2025 17:05:57 +0200 Subject: [PATCH 2/2] issue-20188:generate files --- .../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 | 20 +++ .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 95 +++++++++++ .../java-helidon-client/v3/se/docs/FakeApi.md | 8 +- .../java-helidon-client/v3/se/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 16 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 95 +++++++++++ .../java-helidon-client/v4/mp/docs/FakeApi.md | 4 +- .../java-helidon-client/v4/mp/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 95 +++++++++++ .../java-helidon-client/v4/se/docs/FakeApi.md | 8 +- .../java-helidon-client/v4/se/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 16 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 95 +++++++++++ .../java/apache-httpclient/api/openapi.yaml | 38 +++++ .../java/apache-httpclient/docs/FakeApi.md | 8 +- .../java/apache-httpclient/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 14 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 161 +++++++++++++++++- .../petstore/java/feign-hc5/api/openapi.yaml | 38 +++++ .../org/openapitools/client/api/FakeApi.java | 16 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 143 +++++++++++++++- .../openapitools/client/model/EnumTest.java | 8 +- .../petstore/java/feign/api/openapi.yaml | 38 +++++ .../org/openapitools/client/api/FakeApi.java | 16 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 143 +++++++++++++++- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 12 +- .../docs/FakeApi.md | 8 +- .../docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 133 ++++++++++++++- .../docs/FakeApi.md | 8 +- .../docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 145 +++++++++++++++- .../microprofile-rest-client/docs/FakeApi.md | 8 +- .../microprofile-rest-client/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 2 +- .../openapitools/client/model/EnumTest.java | 4 +- .../org/openapitools/client/model/Order.java | 145 +++++++++++++++- .../openapitools/client/model/EnumTest.java | 12 +- .../openapitools/client/model/EnumTest.java | 12 +- .../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 +- .../java/okhttp-gson/api/openapi.yaml | 21 +++ .../AllOfModelArrayAnyOfAllOfAttributesC.md | 10 ++ .../petstore/java/okhttp-gson/docs/FakeApi.md | 6 +- .../petstore/java/okhttp-gson/docs/Order.md | 10 ++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../AllOfModelArrayAnyOfAllOfAttributesC.java | 1 + .../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 | 95 ++++++++++- .../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 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../java/restclient-swagger2/api/openapi.yaml | 38 +++++ .../java/restclient-swagger2/docs/FakeApi.md | 8 +- .../java/restclient-swagger2/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 143 +++++++++++++++- .../api/openapi.yaml | 38 +++++ .../docs/FakeApi.md | 8 +- .../docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 60 +++++-- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../api/openapi.yaml | 38 +++++ .../docs/FakeApi.md | 8 +- .../docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 34 ++-- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../petstore/java/restclient/api/openapi.yaml | 38 +++++ .../petstore/java/restclient/docs/FakeApi.md | 8 +- .../petstore/java/restclient/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../petstore/java/resteasy/api/openapi.yaml | 38 +++++ .../petstore/java/resteasy/docs/FakeApi.md | 8 +- .../petstore/java/resteasy/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../resttemplate-withXml/api/openapi.yaml | 38 +++++ .../java/resttemplate-withXml/docs/FakeApi.md | 8 +- .../java/resttemplate-withXml/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 14 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 155 ++++++++++++++++- .../java/resttemplate/api/openapi.yaml | 38 +++++ .../java/resttemplate/docs/FakeApi.md | 8 +- .../petstore/java/resttemplate/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 14 +- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 157 ++++++++++++++++- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../openapitools/client/model/EnumTest.java | 8 +- .../vertx-supportVertxFuture/api/openapi.yaml | 38 +++++ .../vertx-supportVertxFuture/docs/FakeApi.md | 8 +- .../vertx-supportVertxFuture/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 12 +- .../openapitools/client/api/FakeApiImpl.java | 12 +- .../client/api/rxjava/FakeApi.java | 24 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../petstore/java/vertx/api/openapi.yaml | 38 +++++ .../petstore/java/vertx/docs/FakeApi.md | 8 +- .../client/petstore/java/vertx/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 4 +- .../openapitools/client/api/FakeApiImpl.java | 12 +- .../client/api/rxjava/FakeApi.java | 24 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../java/webclient-jakarta/api/openapi.yaml | 38 +++++ .../java/webclient-jakarta/docs/FakeApi.md | 8 +- .../java/webclient-jakarta/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../java/webclient-swagger2/api/openapi.yaml | 38 +++++ .../java/webclient-swagger2/docs/FakeApi.md | 8 +- .../java/webclient-swagger2/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 143 +++++++++++++++- .../api/openapi.yaml | 38 +++++ .../docs/FakeApi.md | 8 +- .../docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 60 +++++-- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../petstore/java/webclient/api/openapi.yaml | 38 +++++ .../petstore/java/webclient/docs/FakeApi.md | 8 +- .../petstore/java/webclient/docs/Order.md | 20 +++ .../org/openapitools/client/api/FakeApi.java | 26 ++- .../openapitools/client/model/EnumTest.java | 8 +- .../org/openapitools/client/model/Order.java | 141 ++++++++++++++- .../ocaml-fake-petstore/src/apis/fake_api.ml | 8 +- .../ocaml-fake-petstore/src/apis/fake_api.mli | 2 +- .../ocaml-fake-petstore/src/models/order.ml | 18 +- .../ocaml-fake-petstore/src/support/enums.ml | 47 +++++ .../petstore/ruby-autoload/docs/FakeApi.md | 6 +- .../petstore/ruby-autoload/docs/Order.md | 6 +- .../lib/petstore/api/fake_api.rb | 14 ++ .../lib/petstore/models/order.rb | 54 +++++- .../petstore/ruby-faraday/docs/FakeApi.md | 6 +- .../petstore/ruby-faraday/docs/Order.md | 6 +- .../ruby-faraday/lib/petstore/api/fake_api.rb | 14 ++ .../ruby-faraday/lib/petstore/models/order.rb | 54 +++++- .../builds/default-v3.0/apis/FakeApi.ts | 29 ++++ .../builds/default-v3.0/models/Order.ts | 34 ++++ .../openapitools/client/model/EnumTest.java | 12 +- samples/schema/petstore/mysql/Model/Order.sql | 6 +- .../schema/petstore/mysql/mysql_schema.sql | 4 +- .../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 | 41 +++++ .../cpp-restbed/generated/3_0/model/Order.h | 14 ++ .../openapitools/server/api/FakeService.java | 2 +- .../server/api/FakeServiceImpl.java | 2 +- .../openapitools/server/model/EnumTest.java | 4 +- .../org/openapitools/server/model/Order.java | 147 ++++++++++++++++ .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../org/openapitools/server/model/Order.java | 111 +++++++++++- .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../openapitools/server/api/FakeService.java | 2 +- .../server/api/FakeServiceImpl.java | 2 +- .../openapitools/server/model/EnumTest.java | 4 +- .../org/openapitools/server/model/Order.java | 147 ++++++++++++++++ .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../openapitools/server/api/FakeService.java | 59 ++++++- .../server/api/FakeServiceImpl.java | 4 +- .../org/openapitools/server/model/Order.java | 111 +++++++++++- .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../openapitools/server/api/FakeService.java | 59 ++++++- .../server/api/FakeServiceImpl.java | 4 +- .../org/openapitools/server/model/Order.java | 111 +++++++++++- .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../org/openapitools/server/model/Order.java | 111 +++++++++++- .../src/main/resources/META-INF/openapi.yml | 38 +++++ .../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 | 131 +++++++++++++- .../api/impl/FakeApiServiceImpl.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 2 +- .../java/org/openapitools/model/Order.java | 157 ++++++++++++++++- .../src/main/resources/META-INF/openapi.yaml | 38 +++++ .../java/org/openapitools/api/FakeApi.java | 4 +- .../org/openapitools/api/FakeApiService.java | 2 +- .../java/org/openapitools/model/Order.java | 131 +++++++++++++- .../api/impl/FakeApiServiceImpl.java | 2 +- .../php-laravel/.openapi-generator/FILES | 4 + .../php-laravel/Api/FakeApiInterface.php | 4 + .../Http/Controllers/FakeController.php | 10 +- .../petstore/php-laravel/Model/Order.php | 8 + .../php-laravel/Model/OrderOrderStatus.php | 42 +++++ .../php-laravel/Model/OrderPaymentMethod.php | 34 ++++ ...estEnumParametersRequestEnumFormDouble.php | 36 ++++ ...stEnumParametersRequestEnumFormInteger.php | 35 ++++ .../lib/app/Http/Controllers/FakeApi.php | 4 + 262 files changed, 7114 insertions(+), 601 deletions(-) create mode 100644 samples/server/petstore/php-laravel/Model/OrderOrderStatus.php create mode 100644 samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php create mode 100644 samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php 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 128e04a2af08..58671dceb0f0 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 b9e62efef005..3c4b4beaff6e 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 0c3895881c5c..e3fdcecbbf8f 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 39a4ab3b86e1..eb25d27bbb95 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 8343fa6d8110..daabbbebe091 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 033fe85b5b98..93b67a808ac9 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..802dce702f4d 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,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 51d0b283badb..abb5b4b988ab 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/EnumTest.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java index bb19c7b14e3f..3fffb37119e4 100644 --- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/EnumTest.java @@ -78,7 +78,7 @@ public String toString() { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -101,7 +101,7 @@ public String toString() { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; 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 eb935f23a415..e72aea374db9 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,58 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(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; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -180,6 +233,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +288,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).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..802dce702f4d 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,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 bb8217985809..7dd4781d158e 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 c66e825ebc05..85143286803b 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/EnumTest.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java index bb19c7b14e3f..3fffb37119e4 100644 --- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/EnumTest.java @@ -78,7 +78,7 @@ public String toString() { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -101,7 +101,7 @@ public String toString() { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; 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 eb935f23a415..e72aea374db9 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,58 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(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; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -180,6 +233,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +288,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).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..802dce702f4d 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,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 56fbf7b872e1..4df620f3f2db 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/EnumTest.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java index bb19c7b14e3f..3fffb37119e4 100644 --- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/EnumTest.java @@ -78,7 +78,7 @@ public String toString() { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -101,7 +101,7 @@ public String toString() { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; 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 eb935f23a415..e72aea374db9 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,58 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(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; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -180,6 +233,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +288,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).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..802dce702f4d 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,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 18faf4da0d8e..bdb8c2074563 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 672f90177814..9abb5ffe8883 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/EnumTest.java b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java index bb19c7b14e3f..3fffb37119e4 100644 --- a/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java-helidon-client/v4/se/src/main/java/org/openapitools/client/model/EnumTest.java @@ -78,7 +78,7 @@ public String toString() { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -101,7 +101,7 @@ public String toString() { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; 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 eb935f23a415..e72aea374db9 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,58 @@ public String toString() { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(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; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -180,6 +233,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -195,6 +288,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).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 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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..802dce702f4d 100644 --- a/samples/client/petstore/java/apache-httpclient/docs/Order.md +++ b/samples/client/petstore/java/apache-httpclient/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 4308acb2dae5..fbce2ecb3ac0 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(@javax.annotation.Nonnull BigDecimal number, * @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(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException { - this.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, Collections.emptyMap()); + public void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable 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(@javax.annotation.Nullable List enumHeade * @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(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, Map additionalHeaders) throws ApiException { + public void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Map additionalHeaders) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -1188,6 +1192,10 @@ public void testEnumParameters(@javax.annotation.Nullable List enumHeade 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/EnumTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java index c13383fc0ec5..7723954039f9 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/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 888aab4f5a38..1665263d5905 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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -101,6 +104,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -254,6 +335,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -268,12 +399,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -286,6 +419,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } @@ -393,6 +528,26 @@ 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); + } + } + + // add `OrderStatus` to the URL query string + if (getOrderStatus() != null) { + try { + joiner.add(String.format("%sOrderStatus%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getOrderStatus()), "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-hc5/api/openapi.yaml b/samples/client/petstore/java/feign-hc5/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/feign-hc5/api/openapi.yaml +++ b/samples/client/petstore/java/feign-hc5/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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-hc5/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java index 375a8a0f6a29..1abc1a464b28 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java @@ -570,6 +570,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString); + void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble); /** * To test enum parameters @@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString); + ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble); /** @@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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:

*
    @@ -636,7 +642,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); + void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); /** * To test enum parameters @@ -647,6 +653,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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:

    *
      @@ -665,7 +673,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); + ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); /** diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java index 7a5c66b030f8..4ed6ab95ddea 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/feign-hc5/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/feign-hc5/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java index 3ec956f599c8..0e02638a4fe5 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/feign-hc5/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -257,6 +338,58 @@ public void setComplete(@javax.annotation.Nullable Boolean 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; + } + + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -271,12 +404,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -289,6 +424,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } 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 19a10cb6ec11..321fb0ca6bda 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/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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 375a8a0f6a29..1abc1a464b28 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(@javax.annotation.Nonnull final * @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(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString); + void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble); /** * To test enum parameters @@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString); + ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble); /** @@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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:

      *
        @@ -636,7 +642,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); + void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); /** * To test enum parameters @@ -647,6 +653,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final * @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:

        *
          @@ -665,7 +673,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final "enum_header_string: {enumHeaderString}" }) - ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); + ApiResponse testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams); /** 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 7a5c66b030f8..4ed6ab95ddea 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/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java index 3ec956f599c8..0e02638a4fe5 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/feign/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -257,6 +338,58 @@ public void setComplete(@javax.annotation.Nullable Boolean 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; + } + + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + @Override public boolean equals(Object o) { if (this == o) { @@ -271,12 +404,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -289,6 +424,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } 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 39878a2be5c0..d7737dec50fa 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 5b7f5909b33c..d1424e9a21fd 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 5b7f5909b33c..d1424e9a21fd 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 06f8a99b5a09..e806ab5c5b84 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/microprofile-rest-client-3.0-jackson/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md index 02df4858d16b..11175099fcb2 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/FakeApi.md @@ -982,7 +982,7 @@ public class Example { ## 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 @@ -1013,8 +1013,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 { - void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); @@ -1041,6 +1043,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/microprofile-rest-client-3.0-jackson/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md index 4993c503e5f3..d565898583db 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **Date** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java index 6880a77a2cf0..cb2bd78a9601 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java @@ -164,7 +164,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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) 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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString, @Multipart(value = "enum_form_integer", required = false) Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false) BigDecimal enumFormDouble) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java index a038d69ed4ff..1b24964b6ded 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/EnumTest.java @@ -118,7 +118,7 @@ public static EnumStringRequiredEnum fromValue(String value) { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -154,7 +154,7 @@ public static EnumIntegerEnum fromValue(Integer value) { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java index 66b6a7970e25..086a8c591a08 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java @@ -23,6 +23,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.util.Date; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -33,7 +34,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) public class Order { @@ -97,6 +100,84 @@ public static StatusEnum fromValue(String value) { private Boolean complete = false; + public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2")); + + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + @JsonValue + public BigDecimal value() { + 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"; + /** + * Various payment methods + */ + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + @JsonValue + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + /** + * Order status + */ + + private OrderStatusEnum orderStatus; + /** * Get id @@ -242,6 +323,54 @@ public Order complete(Boolean complete) { return this; } + /** + * Various payment methods + * @return paymentMethod + **/ + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + /** + * Set paymentMethod + */ + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Order status + * @return orderStatus + **/ + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + */ + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + @Override public boolean equals(Object o) { return EqualsBuilder.reflectionEquals(this, o, false, null, true); @@ -266,6 +395,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md index 02df4858d16b..11175099fcb2 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/FakeApi.md @@ -982,7 +982,7 @@ public class Example { ## 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 @@ -1013,8 +1013,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 { - void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); @@ -1041,6 +1043,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/microprofile-rest-client-3.0/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md index 4993c503e5f3..d565898583db 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **Date** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java index 6880a77a2cf0..cb2bd78a9601 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/api/FakeApi.java @@ -164,7 +164,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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) 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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString, @Multipart(value = "enum_form_integer", required = false) Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false) BigDecimal enumFormDouble) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java index c74fd0080c65..40d57a6de39b 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/EnumTest.java @@ -132,7 +132,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class) public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -177,7 +177,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class) public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java index c1f0422fd21d..83030ea321c5 100644 --- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.Map; import java.util.HashMap; +import java.math.BigDecimal; import java.util.Date; import java.lang.reflect.Type; import jakarta.json.bind.annotation.JsonbTypeDeserializer; @@ -98,6 +99,102 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont @JsonbProperty("complete") private Boolean complete = false; + @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class) + @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class) + public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2")); + + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static final class Deserializer implements JsonbDeserializer { + @Override + public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(parser.getString())) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'"); + } + } + + public static final class Serializer implements JsonbSerializer { + @Override + public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) { + generator.write(obj.value); + } + } + } + + /** + * Various payment methods + */ + @JsonbProperty("paymentMethod") + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + @JsonbTypeSerializer(OrderStatusEnum.Serializer.class) + @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class) + public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static final class Deserializer implements JsonbDeserializer { + @Override + public OrderStatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(parser.getString())) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'"); + } + } + + public static final class Serializer implements JsonbSerializer { + @Override + public void serialize(OrderStatusEnum obj, JsonGenerator generator, SerializationContext ctx) { + generator.write(obj.value); + } + } + } + + /** + * Order status + */ + @JsonbProperty("OrderStatus") + private OrderStatusEnum orderStatus; + /** * Get id @@ -219,6 +316,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + */ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -233,12 +370,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } /** @@ -255,6 +394,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md index 02df4858d16b..11175099fcb2 100644 --- a/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md +++ b/samples/client/petstore/java/microprofile-rest-client/docs/FakeApi.md @@ -982,7 +982,7 @@ public class Example { ## 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 @@ -1013,8 +1013,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 { - void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + void result = apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEnumParameters"); @@ -1041,6 +1043,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/microprofile-rest-client/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md index 4993c503e5f3..d565898583db 100644 --- a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md +++ b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **Date** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java index 15f4ce0f5fbc..7387b7a27bac 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/api/FakeApi.java @@ -164,7 +164,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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) 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, @Multipart(value = "enum_form_string_array", required = false) List enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString, @Multipart(value = "enum_form_integer", required = false) Integer enumFormInteger, @Multipart(value = "enum_form_double", required = false) BigDecimal enumFormDouble) throws ApiException, ProcessingException; /** * Fake endpoint to test group parameters (optional) diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java index a8f35be5248a..0ac22833d5a5 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/EnumTest.java @@ -129,7 +129,7 @@ public void serialize(EnumStringRequiredEnum obj, JsonGenerator generator, Seria @JsonbTypeDeserializer(EnumIntegerEnum.Deserializer.class) public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); Integer value; @@ -174,7 +174,7 @@ public void serialize(EnumIntegerEnum obj, JsonGenerator generator, Serializatio @JsonbTypeDeserializer(EnumNumberEnum.Deserializer.class) public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); Double value; diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java index f87c5fee94ce..72999ea487a5 100644 --- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java @@ -16,6 +16,7 @@ import java.util.Arrays; import java.util.Map; import java.util.HashMap; +import java.math.BigDecimal; import java.util.Date; import java.lang.reflect.Type; import javax.json.bind.annotation.JsonbTypeDeserializer; @@ -95,6 +96,102 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont @JsonbProperty("complete") private Boolean complete = false; + @JsonbTypeSerializer(PaymentMethodEnum.Serializer.class) + @JsonbTypeDeserializer(PaymentMethodEnum.Deserializer.class) + public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2")); + + + BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static final class Deserializer implements JsonbDeserializer { + @Override + public PaymentMethodEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(parser.getString())) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'"); + } + } + + public static final class Serializer implements JsonbSerializer { + @Override + public void serialize(PaymentMethodEnum obj, JsonGenerator generator, SerializationContext ctx) { + generator.write(obj.value); + } + } + } + + /** + * Various payment methods + */ + @JsonbProperty("paymentMethod") + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + @JsonbTypeSerializer(OrderStatusEnum.Serializer.class) + @JsonbTypeDeserializer(OrderStatusEnum.Deserializer.class) + public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + + Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static final class Deserializer implements JsonbDeserializer { + @Override + public OrderStatusEnum deserialize(JsonParser parser, DeserializationContext ctx, Type rtType) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(parser.getString())) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + parser.getString() + "'"); + } + } + + public static final class Serializer implements JsonbSerializer { + @Override + public void serialize(OrderStatusEnum obj, JsonGenerator generator, SerializationContext ctx) { + generator.write(obj.value); + } + } + } + + /** + * Order status + */ + @JsonbProperty("OrderStatus") + private OrderStatusEnum orderStatus; + /** * Get id @@ -216,6 +313,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + */ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -230,12 +367,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } /** @@ -252,6 +391,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } 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 f27263c8f8cd..d70e3fc17df0 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 357f3b979c38..c2415bf7fe2e 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/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java index b9c963b6b646..e1ff6e9242fb 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/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/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java index 277416b4af62..1e0d345cba48 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-3.1/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-awsv4signature/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java index b9c963b6b646..e1ff6e9242fb 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/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/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java index 277416b4af62..1e0d345cba48 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/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-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java index 7aef55bf1192..122e6a7534c5 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java @@ -56,13 +56,13 @@ public class BigCat extends Cat { */ @JsonAdapter(KindEnum.Adapter.class) public enum KindEnum { - LIONS("lions"), + LIONS(String.valueOf("lions")), - TIGERS("tigers"), + TIGERS(String.valueOf("tigers")), - LEOPARDS("leopards"), + LEOPARDS(String.valueOf("leopards")), - JAGUARS("jaguars"); + JAGUARS(String.valueOf("jaguars")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java index 9cb4ed6d87fc..b5982ff19835 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/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-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java index b855cc7caf4e..2eb8bdde3357 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java @@ -56,11 +56,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; @@ -115,11 +115,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-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java index fc09b441a88e..47eb70194183 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/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-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java index 0a40746b36db..a2e6850ab8fd 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/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/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java index 26d7af806193..3b0fa6662cc1 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Pet.java @@ -86,11 +86,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-group-parameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java index b9c963b6b646..e1ff6e9242fb 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/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/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java index 277416b4af62..1e0d345cba48 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/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-nullable-required/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java index b9c963b6b646..e1ff6e9242fb 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/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/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java index 277416b4af62..1e0d345cba48 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/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-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java index 22477095162a..6a43910d3083 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java @@ -85,11 +85,11 @@ public class PetWithRequiredNullableCases1 { */ @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-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java index 5caac0b64634..c305211e9c4d 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java @@ -84,11 +84,11 @@ public class PetWithRequiredNullableCases2 { */ @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-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java index acac05665744..25095b300ebc 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java @@ -58,13 +58,13 @@ public class BigCat extends Cat implements Parcelable { */ @JsonAdapter(KindEnum.Adapter.class) public enum KindEnum { - LIONS("lions"), + LIONS(String.valueOf("lions")), - TIGERS("tigers"), + TIGERS(String.valueOf("tigers")), - LEOPARDS("leopards"), + LEOPARDS(String.valueOf("leopards")), - JAGUARS("jaguars"); + JAGUARS(String.valueOf("jaguars")); private String value; diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java index 29a103047339..d5068576955c 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -59,9 +59,9 @@ public class EnumArrays implements Parcelable { */ @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; @@ -116,9 +116,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-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java index 351ef95315b8..29abf7f861e5 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java @@ -58,11 +58,11 @@ public class EnumTest implements Parcelable { */ @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; @@ -117,11 +117,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-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java index 7424298592f4..a9e7de956707 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java @@ -64,9 +64,9 @@ public class MapTest implements Parcelable { */ @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-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java index 1ffd9ca8c1bc..2c5c1c0149d3 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java @@ -78,11 +78,11 @@ public class Order implements Parcelable { */ @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-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java index 327c770e8e4a..5c4c7b64d62c 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java @@ -88,11 +88,11 @@ public class Pet implements Parcelable { */ @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-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java index 017195782b20..aa03413f4af5 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java @@ -79,11 +79,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-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java index e1175f4c02b9..87bac2f925f3 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -87,11 +87,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-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java index fb0d9a8e05a4..25fa9f3ecce3 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java @@ -78,11 +78,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-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java index 5021c5db1b25..3aaca628bd26 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java @@ -86,11 +86,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/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index f21b84165a85..5818a1f74dfd 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -1613,6 +1613,7 @@ components: example: petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2020-02-02T20:20:20.000222Z complete: false @@ -1641,6 +1642,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 @@ -2988,6 +3001,14 @@ components: - -efg - (xyz) type: string + enum_form_integer: + default: 1 + description: Form parameter enum test (integer) + enum: + - 1 + - -1 + - 0 + type: integer 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..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) +> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger) To test enum parameters @@ -1011,8 +1011,9 @@ 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) try { - apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + 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()); @@ -1036,6 +1037,7 @@ 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] | ### 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 7055253c1a0b..a86cc2601198 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,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec * @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 _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -2119,7 +2120,7 @@ public okhttp3.Call testEndpointParametersAsync(@javax.annotation.Nonnull BigDec 404 Not found - */ - public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2152,6 +2153,10 @@ public okhttp3.Call testEnumParametersCall(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback _callback) throws ApiException { - return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, _callback); + private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, final ApiCallback _callback) throws ApiException { + return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback); } @@ -2214,6 +2219,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null * @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) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2223,8 +2229,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(@javax.annotation.Null
          404 Not found -
          */ - public void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException { - testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString); + public void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger) throws ApiException { + testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger); } /** @@ -2238,6 +2244,7 @@ public void testEnumParameters(@javax.annotation.Nullable 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) * @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 +2255,8 @@ public void testEnumParameters(@javax.annotation.Nullable List enumHeade 404 Not found - */ - public ApiResponse testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException { - okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, null); + public ApiResponse testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger) throws ApiException { + okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, null); return localVarApiClient.execute(localVarCall); } @@ -2264,6 +2271,7 @@ public ApiResponse testEnumParametersWithHttpInfo(@javax.annotation.Nullab * @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 _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 +2283,9 @@ public ApiResponse testEnumParametersWithHttpInfo(@javax.annotation.Nullab 404 Not found - */ - public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, final ApiCallback _callback) throws ApiException { + public okhttp3.Call testEnumParametersAsync(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, 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, _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 45f2c9bf2c41..bb09cbfbac5c 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/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java index 97ae5c7a276f..9274a150ba6d 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 35845861e60e..620788ab8c80 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 99a6347001bb..2aab8267b59b 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 26b434ee627b..ae760d187689 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 1c2487b59ab0..2b5d5ab5befd 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 @@ -100,11 +100,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 62705b90d3a1..5e50375545bf 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; @@ -76,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; @@ -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(); @@ -352,7 +431,7 @@ private String toIndentedString(Object o) { static { // a set of all properties/fields (JSON key names) - openapiFields = new HashSet(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete")); + openapiFields = new HashSet(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete", "paymentMethod")); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(0); @@ -378,6 +457,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 { 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 def49ac182ff..27cf6da3a7c5 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 2ed0ec00a75e..eafe0515640e 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 91179d527e5d..ba4bc11f686d 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 b4d3392db00b..e7de1bf99874 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 08eb64b01f25..12b850bc3fcf 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 e997bacf2b15..90c330c6640e 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/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 11da8da33d72..0f31ae90e368 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 2a21019d5d32..fdb8b2008f5f 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/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/restclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md +++ b/samples/client/petstore/java/restclient-swagger2/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/restclient-swagger2/docs/Order.md b/samples/client/petstore/java/restclient-swagger2/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/restclient-swagger2/docs/Order.md +++ b/samples/client/petstore/java/restclient-swagger2/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java index dd49049ce368..fb732d361310 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1175,9 +1175,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1201,6 +1203,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1229,11 +1235,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType); + testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType); } /** @@ -1250,11 +1258,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List enumHea * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1271,11 +1281,13 @@ public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** 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 cdf7dc5bccc4..684c0259d981 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-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java index f50b7b51b9f5..462ff544ba67 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import java.math.BigDecimal; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,7 +35,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -99,6 +102,84 @@ public static StatusEnum fromValue(String value) { @jakarta.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"; + @jakarta.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @jakarta.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -258,6 +339,58 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @jakarta.annotation.Nullable + @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods") + @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(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @jakarta.annotation.Nullable + @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order status") + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -273,12 +406,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -291,6 +426,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/restclient-useSingleRequestParameter-static/docs/FakeApi.md b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/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/restclient-useSingleRequestParameter-static/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java index ff815244586b..0b1636eb88ee 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1557,10 +1557,12 @@ public static class TestEnumParametersRequest { private @jakarta.annotation.Nullable List enumQueryModelArray; private @jakarta.annotation.Nullable List enumFormStringArray; private @jakarta.annotation.Nullable String enumFormString; + private @jakarta.annotation.Nullable Integer enumFormInteger; + private @jakarta.annotation.Nullable BigDecimal enumFormDouble; public TestEnumParametersRequest() {} - public TestEnumParametersRequest(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) { + public TestEnumParametersRequest(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) { this.enumHeaderStringArray = enumHeaderStringArray; this.enumHeaderString = enumHeaderString; this.enumQueryStringArray = enumQueryStringArray; @@ -1570,6 +1572,8 @@ public TestEnumParametersRequest(@jakarta.annotation.Nullable List enumH this.enumQueryModelArray = enumQueryModelArray; this.enumFormStringArray = enumFormStringArray; this.enumFormString = enumFormString; + this.enumFormInteger = enumFormInteger; + this.enumFormDouble = enumFormDouble; } public @jakarta.annotation.Nullable List enumHeaderStringArray() { @@ -1644,6 +1648,22 @@ public TestEnumParametersRequest enumFormString(@jakarta.annotation.Nullable Str return this; } + public @jakarta.annotation.Nullable Integer enumFormInteger() { + return this.enumFormInteger; + } + public TestEnumParametersRequest enumFormInteger(@jakarta.annotation.Nullable Integer enumFormInteger) { + this.enumFormInteger = enumFormInteger; + return this; + } + + public @jakarta.annotation.Nullable BigDecimal enumFormDouble() { + return this.enumFormDouble; + } + public TestEnumParametersRequest enumFormDouble(@jakarta.annotation.Nullable BigDecimal enumFormDouble) { + this.enumFormDouble = enumFormDouble; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -1661,12 +1681,14 @@ public boolean equals(Object o) { Objects.equals(this.enumQueryDouble, request.enumQueryDouble()) && Objects.equals(this.enumQueryModelArray, request.enumQueryModelArray()) && Objects.equals(this.enumFormStringArray, request.enumFormStringArray()) && - Objects.equals(this.enumFormString, request.enumFormString()); + Objects.equals(this.enumFormString, request.enumFormString()) && + Objects.equals(this.enumFormInteger, request.enumFormInteger()) && + Objects.equals(this.enumFormDouble, request.enumFormDouble()); } @Override public int hashCode() { - return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } } @@ -1679,7 +1701,7 @@ public int hashCode() { * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ public void testEnumParameters(TestEnumParametersRequest requestParameters) throws RestClientResponseException { - this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1691,7 +1713,7 @@ public void testEnumParameters(TestEnumParametersRequest requestParameters) thro * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ public ResponseEntity testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws RestClientResponseException { - return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1704,7 +1726,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(TestEnumParametersReq * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws RestClientResponseException { - return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1721,9 +1743,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1747,6 +1771,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1775,11 +1803,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType); + testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType); } /** @@ -1796,11 +1826,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List enumHea * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1817,11 +1849,13 @@ public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } public static class TestGroupParametersRequest { diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java index 4e514b92bc54..a9013f1d762b 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/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-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java index a82ac56417f6..5ea0753dde2b 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) { @jakarta.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"; + @jakarta.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @jakarta.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @jakarta.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(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/restclient-useSingleRequestParameter/docs/FakeApi.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/FakeApi.md +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/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/restclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java index b82c8b2f3c4b..4dd72b1f4c8a 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1272,7 +1272,7 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } - public record TestEnumParametersRequest(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString){} + public record TestEnumParametersRequest(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble){} /** * To test enum parameters @@ -1283,7 +1283,7 @@ public record TestEnumParametersRequest(@jakarta.annotation.Nullable List testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws RestClientResponseException { - return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1308,7 +1308,7 @@ public ResponseEntity testEnumParametersWithHttpInfo(TestEnumParametersReq * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws RestClientResponseException { - return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1325,9 +1325,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1351,6 +1353,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1379,11 +1385,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType); + testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType); } /** @@ -1400,11 +1408,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List enumHea * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1421,11 +1431,13 @@ public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } public record TestGroupParametersRequest(@jakarta.annotation.Nonnull Integer requiredStringGroup, @jakarta.annotation.Nonnull Boolean requiredBooleanGroup, @jakarta.annotation.Nonnull Long requiredInt64Group, @jakarta.annotation.Nullable Integer stringGroup, @jakarta.annotation.Nullable Boolean booleanGroup, @jakarta.annotation.Nullable Long int64Group){} 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 4e514b92bc54..a9013f1d762b 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-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java index a82ac56417f6..5ea0753dde2b 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) { @jakarta.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"; + @jakarta.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @jakarta.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @jakarta.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(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/restclient/api/openapi.yaml +++ b/samples/client/petstore/java/restclient/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/restclient/docs/FakeApi.md b/samples/client/petstore/java/restclient/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/restclient/docs/FakeApi.md +++ b/samples/client/petstore/java/restclient/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/restclient/docs/Order.md b/samples/client/petstore/java/restclient/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/restclient/docs/Order.md +++ b/samples/client/petstore/java/restclient/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java index dd49049ce368..fb732d361310 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1175,9 +1175,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -1201,6 +1203,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1229,11 +1235,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public void testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).body(localVarReturnType); + testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).body(localVarReturnType); } /** @@ -1250,11 +1258,13 @@ public void testEnumParameters(@jakarta.annotation.Nullable List enumHea * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { + public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1271,11 +1281,13 @@ public ResponseEntity testEnumParametersWithHttpInfo(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws RestClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws RestClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** 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 4e514b92bc54..a9013f1d762b 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/restclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java index a82ac56417f6..5ea0753dde2b 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/restclient/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) { @jakarta.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"; + @jakarta.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @jakarta.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @jakarta.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(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/resteasy/api/openapi.yaml +++ b/samples/client/petstore/java/resteasy/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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..802dce702f4d 100644 --- a/samples/client/petstore/java/resteasy/docs/Order.md +++ b/samples/client/petstore/java/resteasy/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + 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 d77ec4ae2a1f..5080f3cb2234 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(@javax.annotation.Nonnull BigDecimal number, * @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(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws ApiException { + public void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws ApiException { Object localVarPostBody = null; // create path and map variables @@ -722,6 +724,10 @@ public void testEnumParameters(@javax.annotation.Nullable List enumHeade 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/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java index 1f13126f6aa5..3161d295161f 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/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 08ab0dcd569e..1067e40efb39 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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -265,12 +396,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -283,6 +416,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md +++ b/samples/client/petstore/java/resttemplate-withXml/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/resttemplate-withXml/docs/Order.md b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md +++ b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java index e560c3105ddf..224c830297a4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java @@ -773,10 +773,12 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number * @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 RestClientException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws RestClientException { - testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + 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 RestClientException { + testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** @@ -793,10 +795,12 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws RestClientException { + public ResponseEntity testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException { Object localVarPostBody = null; @@ -821,6 +825,10 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead localVarFormParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) localVarFormParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + localVarFormParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + localVarFormParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); 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 d5d33f9161b5..004aaa960543 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-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java index b9579f3b0449..97e7514f747a 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate-withXml/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; @@ -37,7 +38,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") @XmlRootElement(name = "Order") @@ -117,6 +120,94 @@ public static StatusEnum fromValue(String value) { @javax.annotation.Nullable private Boolean complete = false; + /** + * Various payment methods + */ + @XmlType(name="PaymentMethodEnum") + @XmlEnum(BigDecimal.class) + public enum PaymentMethodEnum { + @XmlEnumValue(new BigDecimal("1")) + NUMBER_1(new BigDecimal("1")), + + @XmlEnumValue(new BigDecimal("2")) + 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"; + @XmlElement(name = "paymentMethod") + @javax.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + @XmlType(name="OrderStatusEnum") + @XmlEnum(Object.class) + public enum OrderStatusEnum { + @XmlEnumValue("PENDING") + PENDING("PENDING"), + + @XmlEnumValue("PROCESSING") + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @XmlElement(name = "OrderStatus") + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -282,6 +373,60 @@ 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) + @JacksonXmlProperty(localName = "paymentMethod") + + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JacksonXmlProperty(localName = "paymentMethod") + public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JacksonXmlProperty(localName = "OrderStatus") + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + @JacksonXmlProperty(localName = "OrderStatus") + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -297,12 +442,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -315,6 +462,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/resttemplate/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md +++ b/samples/client/petstore/java/resttemplate/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/resttemplate/docs/Order.md b/samples/client/petstore/java/resttemplate/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/resttemplate/docs/Order.md +++ b/samples/client/petstore/java/resttemplate/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java index e560c3105ddf..224c830297a4 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java @@ -773,10 +773,12 @@ public ResponseEntity testEndpointParametersWithHttpInfo(BigDecimal number * @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 RestClientException if an error occurs while attempting to invoke the API */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws RestClientException { - testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + 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 RestClientException { + testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** @@ -793,10 +795,12 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @return ResponseEntity<Void> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public ResponseEntity testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) throws RestClientException { + public ResponseEntity testEnumParametersWithHttpInfo(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws RestClientException { Object localVarPostBody = null; @@ -821,6 +825,10 @@ public ResponseEntity testEnumParametersWithHttpInfo(List enumHead localVarFormParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) localVarFormParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + localVarFormParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + localVarFormParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); 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 f28484f9351d..aba6fee9653e 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/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java index 86c243f66589..e9ebcbdfc98e 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/resttemplate/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,19 +101,99 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } /** * Constructor with all args parameters */ - public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) { + public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete, @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) PaymentMethodEnum paymentMethod, @JsonProperty(JSON_PROPERTY_ORDER_STATUS) OrderStatusEnum orderStatus) { this.id = id; this.petId = petId; this.quantity = quantity; this.shipDate = shipDate; this.status = status; this.complete = complete; + this.paymentMethod = paymentMethod; + this.orderStatus = orderStatus; } public Order id(@javax.annotation.Nullable Long id) { @@ -263,6 +346,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -278,12 +411,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -296,6 +431,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } @@ -347,6 +484,14 @@ public Order.Builder complete(Boolean complete) { this.instance.complete = complete; return this; } + public Order.Builder paymentMethod(PaymentMethodEnum paymentMethod) { + this.instance.paymentMethod = paymentMethod; + return this; + } + public Order.Builder orderStatus(OrderStatusEnum orderStatus) { + this.instance.orderStatus = orderStatus; + return this; + } /** @@ -386,7 +531,9 @@ public Order.Builder toBuilder() { .quantity(getQuantity()) .shipDate(getShipDate()) .status(getStatus()) - .complete(getComplete()); + .complete(getComplete()) + .paymentMethod(getPaymentMethod()) + .orderStatus(getOrderStatus()); } 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 7be986b52af6..a297bdb5e186 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 69276325e620..e10d20da0b38 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 69276325e620..e10d20da0b38 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 69276325e620..e10d20da0b38 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 39878a2be5c0..d7737dec50fa 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-supportVertxFuture/api/openapi.yaml b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml +++ b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/vertx-supportVertxFuture/docs/FakeApi.md b/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md index 22cff7dd2e8a..8d12ae9b0f80 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/docs/FakeApi.md +++ b/samples/client/petstore/java/vertx-supportVertxFuture/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/vertx-supportVertxFuture/docs/Order.md b/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md +++ b/samples/client/petstore/java/vertx-supportVertxFuture/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java index b5f109d785f9..14ff9b5f74ed 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApi.java @@ -250,19 +250,19 @@ default Future testEndpointParameters(@javax.annotation.Nonnull BigDecimal return promise.future(); } - void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, Handler> handler); + void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Handler> handler); - default Future testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString){ + default Future testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble){ Promise promise = Promise.promise(); - testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, promise); + testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, promise); return promise.future(); } - void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo, Handler> handler); + void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler> handler); - default Future testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo){ + default Future testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo){ Promise promise = Promise.promise(); - testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, promise); + testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, promise); return promise.future(); } diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 467bbb6cbe88..a69e84fd4e1c 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -772,10 +772,12 @@ 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) * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Handler> resultHandler) { - testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, null, resultHandler); + 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, Handler> resultHandler) { + testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null, resultHandler); } /** @@ -790,10 +792,12 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @param authInfo per call authentication override. * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + 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, ApiClient.AuthInfo authInfo, Handler> resultHandler) { Object localVarBody = null; // create path and map variables @@ -822,6 +826,8 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe Map localVarFormParams = new HashMap<>(); if (enumFormStringArray != null) 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); String[] localVarAccepts = { }; String[] localVarContentTypes = { "application/x-www-form-urlencoded" }; diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index 25d9f5273882..684d8b90d9ba 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -734,10 +734,12 @@ public Single rxTestEndpointParameters(BigDecimal number, Double _double, * @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) * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Handler> resultHandler) { - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, resultHandler); + 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, Handler> resultHandler) { + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, resultHandler); } /** @@ -752,11 +754,13 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @param authInfo call specific auth overrides * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler> resultHandler) { - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, resultHandler); + 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, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, resultHandler); } /** @@ -771,11 +775,13 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, fut) + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, fut) )); } @@ -791,12 +797,14 @@ public Single rxTestEnumParameters(List enumHeaderStringArray, Str * @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) * @param authInfo call specific auth overrides * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo) { + public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, fut) + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, fut) )); } /** diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java index 1f13126f6aa5..3161d295161f 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/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/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java index 08ab0dcd569e..1067e40efb39 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/vertx-supportVertxFuture/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -265,12 +396,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -283,6 +416,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/vertx/api/openapi.yaml +++ b/samples/client/petstore/java/vertx/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md index 22cff7dd2e8a..8d12ae9b0f80 100644 --- a/samples/client/petstore/java/vertx/docs/FakeApi.md +++ b/samples/client/petstore/java/vertx/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/vertx/docs/Order.md b/samples/client/petstore/java/vertx/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/vertx/docs/Order.md +++ b/samples/client/petstore/java/vertx/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java index f3f934b1c703..bec8c7caa62e 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java @@ -80,9 +80,9 @@ public interface FakeApi { void testEndpointParameters(@javax.annotation.Nonnull BigDecimal number, @javax.annotation.Nonnull Double _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull byte[] _byte, @javax.annotation.Nullable Integer integer, @javax.annotation.Nullable Integer int32, @javax.annotation.Nullable Long int64, @javax.annotation.Nullable Float _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable AsyncFile binary, @javax.annotation.Nullable LocalDate date, @javax.annotation.Nullable OffsetDateTime dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback, ApiClient.AuthInfo authInfo, Handler> handler); - void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, Handler> handler); + void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, Handler> handler); - void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, ApiClient.AuthInfo authInfo, Handler> handler); + void testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo, Handler> handler); void testGroupParameters(@javax.annotation.Nonnull Integer requiredStringGroup, @javax.annotation.Nonnull Boolean requiredBooleanGroup, @javax.annotation.Nonnull Long requiredInt64Group, @javax.annotation.Nullable Integer stringGroup, @javax.annotation.Nullable Boolean booleanGroup, @javax.annotation.Nullable Long int64Group, Handler> handler); diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java index 467bbb6cbe88..a69e84fd4e1c 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java @@ -772,10 +772,12 @@ 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) * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Handler> resultHandler) { - testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, null, resultHandler); + 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, Handler> resultHandler) { + testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null, resultHandler); } /** @@ -790,10 +792,12 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @param authInfo per call authentication override. * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + 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, ApiClient.AuthInfo authInfo, Handler> resultHandler) { Object localVarBody = null; // create path and map variables @@ -822,6 +826,8 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe Map localVarFormParams = new HashMap<>(); if (enumFormStringArray != null) 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); String[] localVarAccepts = { }; String[] localVarContentTypes = { "application/x-www-form-urlencoded" }; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java index 25d9f5273882..684d8b90d9ba 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java @@ -734,10 +734,12 @@ public Single rxTestEndpointParameters(BigDecimal number, Double _double, * @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) * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Handler> resultHandler) { - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, resultHandler); + 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, Handler> resultHandler) { + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, resultHandler); } /** @@ -752,11 +754,13 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @param authInfo call specific auth overrides * @param resultHandler Asynchronous result handler */ - public void testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo, Handler> resultHandler) { - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, resultHandler); + 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, ApiClient.AuthInfo authInfo, Handler> resultHandler) { + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, resultHandler); } /** @@ -771,11 +775,13 @@ public void testEnumParameters(List enumHeaderStringArray, String enumHe * @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) * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString) { + public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, fut) + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, fut) )); } @@ -791,12 +797,14 @@ public Single rxTestEnumParameters(List enumHeaderStringArray, Str * @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) * @param authInfo call specific auth overrides * @return Asynchronous result handler (RxJava Single) */ - public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, ApiClient.AuthInfo authInfo) { + public Single rxTestEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, ApiClient.AuthInfo authInfo) { return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut -> - delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, authInfo, fut) + delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, authInfo, fut) )); } /** 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 1f13126f6aa5..3161d295161f 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/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java index 08ab0dcd569e..1067e40efb39 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/vertx/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -265,12 +396,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -283,6 +416,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/webclient-jakarta/docs/FakeApi.md b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient-jakarta/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/webclient-jakarta/docs/Order.md b/samples/client/petstore/java/webclient-jakarta/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/webclient-jakarta/docs/Order.md +++ b/samples/client/petstore/java/webclient-jakarta/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java index 56c5feaa57c0..3976baf7a015 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1177,9 +1177,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@jakarta.annotation.N * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap(); @@ -1203,6 +1205,10 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1231,11 +1237,13 @@ private ResponseSpec testEnumParametersRequestCreation(@jakarta.annotation.Nulla * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono testEnumParameters(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType); } /** @@ -1252,11 +1260,13 @@ public Mono testEnumParameters(@jakarta.annotation.Nullable List e * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono> testEnumParametersWithHttpInfo(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1273,11 +1283,13 @@ public Mono> testEnumParametersWithHttpInfo(@jakarta.annota * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString) throws WebClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@jakarta.annotation.Nullable List enumHeaderStringArray, @jakarta.annotation.Nullable String enumHeaderString, @jakarta.annotation.Nullable List enumQueryStringArray, @jakarta.annotation.Nullable String enumQueryString, @jakarta.annotation.Nullable Integer enumQueryInteger, @jakarta.annotation.Nullable Double enumQueryDouble, @jakarta.annotation.Nullable List enumQueryModelArray, @jakarta.annotation.Nullable List enumFormStringArray, @jakarta.annotation.Nullable String enumFormString, @jakarta.annotation.Nullable Integer enumFormInteger, @jakarta.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** 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 4e514b92bc54..a9013f1d762b 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-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java index a82ac56417f6..5ea0753dde2b 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient-jakarta/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) { @jakarta.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"; + @jakarta.annotation.Nullable + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @jakarta.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ public void setComplete(@jakarta.annotation.Nullable Boolean complete) { this.complete = complete; } + public Order paymentMethod(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + */ + @jakarta.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(@jakarta.annotation.Nullable PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@jakarta.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/webclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient-swagger2/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/webclient-swagger2/docs/Order.md b/samples/client/petstore/java/webclient-swagger2/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/webclient-swagger2/docs/Order.md +++ b/samples/client/petstore/java/webclient-swagger2/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java index 24492104996f..637f83f20bf7 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1177,9 +1177,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap(); @@ -1203,6 +1205,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1231,11 +1237,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType); } /** @@ -1252,11 +1260,13 @@ public Mono testEnumParameters(@javax.annotation.Nullable List enu * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1273,11 +1283,13 @@ public Mono> testEnumParametersWithHttpInfo(@javax.annotati * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** 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 fb05421d28ab..c6fe69de74b0 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-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java index f8675a494703..5b98dfaa8f4f 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import java.math.BigDecimal; import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,7 +35,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -99,6 +102,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -258,6 +339,58 @@ 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 + @Schema(example = "1", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Various payment methods") + @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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order status") + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -273,12 +406,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -291,6 +426,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/webclient-useSingleRequestParameter/docs/FakeApi.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/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/webclient-useSingleRequestParameter/docs/Order.md b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java index 8bb05b96c3d2..4aff3d6c165a 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1562,10 +1562,12 @@ public class TestEnumParametersRequest { private @javax.annotation.Nullable List enumQueryModelArray; private @javax.annotation.Nullable List enumFormStringArray; private @javax.annotation.Nullable String enumFormString; + private @javax.annotation.Nullable Integer enumFormInteger; + private @javax.annotation.Nullable BigDecimal enumFormDouble; public TestEnumParametersRequest() {} - public TestEnumParametersRequest(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) { + public TestEnumParametersRequest(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) { this.enumHeaderStringArray = enumHeaderStringArray; this.enumHeaderString = enumHeaderString; this.enumQueryStringArray = enumQueryStringArray; @@ -1575,6 +1577,8 @@ public TestEnumParametersRequest(@javax.annotation.Nullable List enumHea this.enumQueryModelArray = enumQueryModelArray; this.enumFormStringArray = enumFormStringArray; this.enumFormString = enumFormString; + this.enumFormInteger = enumFormInteger; + this.enumFormDouble = enumFormDouble; } public @javax.annotation.Nullable List enumHeaderStringArray() { @@ -1649,6 +1653,22 @@ public TestEnumParametersRequest enumFormString(@javax.annotation.Nullable Strin return this; } + public @javax.annotation.Nullable Integer enumFormInteger() { + return this.enumFormInteger; + } + public TestEnumParametersRequest enumFormInteger(@javax.annotation.Nullable Integer enumFormInteger) { + this.enumFormInteger = enumFormInteger; + return this; + } + + public @javax.annotation.Nullable BigDecimal enumFormDouble() { + return this.enumFormDouble; + } + public TestEnumParametersRequest enumFormDouble(@javax.annotation.Nullable BigDecimal enumFormDouble) { + this.enumFormDouble = enumFormDouble; + return this; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -1666,12 +1686,14 @@ public boolean equals(Object o) { Objects.equals(this.enumQueryDouble, request.enumQueryDouble()) && Objects.equals(this.enumQueryModelArray, request.enumQueryModelArray()) && Objects.equals(this.enumFormStringArray, request.enumFormStringArray()) && - Objects.equals(this.enumFormString, request.enumFormString()); + Objects.equals(this.enumFormString, request.enumFormString()) && + Objects.equals(this.enumFormInteger, request.enumFormInteger()) && + Objects.equals(this.enumFormDouble, request.enumFormDouble()); } @Override public int hashCode() { - return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + return Objects.hash(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } } @@ -1684,7 +1706,7 @@ public int hashCode() { * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono testEnumParameters(TestEnumParametersRequest requestParameters) throws WebClientResponseException { - return this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParameters(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1696,7 +1718,7 @@ public Mono testEnumParameters(TestEnumParametersRequest requestParameters * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public Mono> testEnumParametersWithHttpInfo(TestEnumParametersRequest requestParameters) throws WebClientResponseException { - return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithHttpInfo(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } /** @@ -1709,7 +1731,7 @@ public Mono> testEnumParametersWithHttpInfo(TestEnumParamet * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest requestParameters) throws WebClientResponseException { - return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString()); + return this.testEnumParametersWithResponseSpec(requestParameters.enumHeaderStringArray(), requestParameters.enumHeaderString(), requestParameters.enumQueryStringArray(), requestParameters.enumQueryString(), requestParameters.enumQueryInteger(), requestParameters.enumQueryDouble(), requestParameters.enumQueryModelArray(), requestParameters.enumFormStringArray(), requestParameters.enumFormString(), requestParameters.enumFormInteger(), requestParameters.enumFormDouble()); } @@ -1727,9 +1749,11 @@ public ResponseSpec testEnumParametersWithResponseSpec(TestEnumParametersRequest * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap(); @@ -1753,6 +1777,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1781,11 +1809,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType); } /** @@ -1802,11 +1832,13 @@ public Mono testEnumParameters(@javax.annotation.Nullable List enu * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1823,11 +1855,13 @@ public Mono> testEnumParametersWithHttpInfo(@javax.annotati * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } public class TestGroupParametersRequest { diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java index 0cef03d1abfa..7755af53ee37 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/EnumTest.java +++ b/samples/client/petstore/java/webclient-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/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java index 16660e6b522e..4280a0e11cf4 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml index 7d3a48a0496b..f975bba3e6a0 100644 --- a/samples/client/petstore/java/webclient/api/openapi.yaml +++ b/samples/client/petstore/java/webclient/api/openapi.yaml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md index 37a949ea0508..55324d1d878f 100644 --- a/samples/client/petstore/java/webclient/docs/FakeApi.md +++ b/samples/client/petstore/java/webclient/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/webclient/docs/Order.md b/samples/client/petstore/java/webclient/docs/Order.md index 27af32855c5c..802dce702f4d 100644 --- a/samples/client/petstore/java/webclient/docs/Order.md +++ b/samples/client/petstore/java/webclient/docs/Order.md @@ -13,6 +13,8 @@ |**shipDate** | **OffsetDateTime** | | [optional] | |**status** | [**StatusEnum**](#StatusEnum) | Order Status | [optional] | |**complete** | **Boolean** | | [optional] | +|**paymentMethod** | [**PaymentMethodEnum**](#PaymentMethodEnum) | Various payment methods | [optional] | +|**orderStatus** | [**OrderStatusEnum**](#OrderStatusEnum) | Order status | [optional] | @@ -26,3 +28,21 @@ +## Enum: PaymentMethodEnum + +| Name | Value | +|---- | -----| +| NUMBER_1 | new BigDecimal("1") | +| NUMBER_2 | new BigDecimal("2") | + + + +## Enum: OrderStatusEnum + +| Name | Value | +|---- | -----| +| PENDING | "PENDING" | +| PROCESSING | "PROCESSING" | + + + diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java index 24492104996f..637f83f20bf7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java @@ -1177,9 +1177,11 @@ public ResponseSpec testEndpointParametersWithResponseSpec(@javax.annotation.Non * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap(); @@ -1203,6 +1205,10 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl formParams.addAll("enum_form_string_array", enumFormStringArray); if (enumFormString != null) formParams.add("enum_form_string", enumFormString); + if (enumFormInteger != null) + formParams.add("enum_form_integer", enumFormInteger); + if (enumFormDouble != null) + formParams.add("enum_form_double", enumFormDouble); final String[] localVarAccepts = { }; final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); @@ -1231,11 +1237,13 @@ private ResponseSpec testEnumParametersRequestCreation(@javax.annotation.Nullabl * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono testEnumParameters(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).bodyToMono(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).bodyToMono(localVarReturnType); } /** @@ -1252,11 +1260,13 @@ public Mono testEnumParameters(@javax.annotation.Nullable List enu * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { + public Mono> testEnumParametersWithHttpInfo(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString).toEntity(localVarReturnType); + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble).toEntity(localVarReturnType); } /** @@ -1273,11 +1283,13 @@ public Mono> testEnumParametersWithHttpInfo(@javax.annotati * @param enumQueryModelArray The enumQueryModelArray parameter * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString) throws WebClientResponseException { - return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + public ResponseSpec testEnumParametersWithResponseSpec(@javax.annotation.Nullable List enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable List enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable Integer enumQueryInteger, @javax.annotation.Nullable Double enumQueryDouble, @javax.annotation.Nullable List enumQueryModelArray, @javax.annotation.Nullable List enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable Integer enumFormInteger, @javax.annotation.Nullable BigDecimal enumFormDouble) throws WebClientResponseException { + return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } /** 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 0cef03d1abfa..7755af53ee37 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/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java index 16660e6b522e..4280a0e11cf4 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java +++ b/samples/client/petstore/java/webclient/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,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ 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; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @javax.annotation.Nullable + private OrderStatusEnum orderStatus; + public Order() { } @@ -251,6 +332,56 @@ 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; + } + + public Order orderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOrderStatus(@javax.annotation.Nullable OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -266,12 +397,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -284,6 +417,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.ml b/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.ml index 7dd18fe3ceb2..b5857a2cee3e 100644 --- a/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.ml +++ b/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.ml @@ -521,7 +521,7 @@ let test_endpoint_parameters ~number ~double ~pattern_without_delimiter ~byte ?i Cohttp_lwt_unix.Client.call `POST uri ~headers ~body >>= fun (resp, body) -> Request.handle_unit_response resp -let test_enum_parameters ?(enum_header_string_array = []) ?(enum_header_string = `Minusefg) ?(enum_query_string_array = []) ?(enum_query_string = `Minusefg) ?enum_query_integer ?enum_query_double ?(enum_query_model_array = []) ?(enum_form_string_array = [`Dollar]) ?(enum_form_string = `Minusefg) () = +let test_enum_parameters ?(enum_header_string_array = []) ?(enum_header_string = `Minusefg) ?(enum_query_string_array = []) ?(enum_query_string = `Minusefg) ?enum_query_integer ?enum_query_double ?(enum_query_model_array = []) ?(enum_form_string_array = [`Dollar]) ?(enum_form_string = `Minusefg) ?(enum_form_integer = `_1) ?(enum_form_double = `_1Period1) () = let open Lwt.Infix in let uri = Request.build_uri "/fake" in let headers = Request.default_headers in @@ -581,6 +581,12 @@ let test_enum_parameters ?(enum_header_string_array = []) ?(enum_header_string = let body = Request.add_form_encoded_body_param body "enum_form_string" Enums.show_enumclass enum_form_string in + let body = Request.add_form_encoded_body_param body "enum_form_integer" Enums.show_enum_form_integer + + enum_form_integer in + let body = Request.add_form_encoded_body_param body "enum_form_double" Enums.show_enum_form_double + + enum_form_double in let body = Request.finalize_form_encoded_body body in Cohttp_lwt_unix.Client.call `GET uri ~headers ~body >>= fun (resp, body) -> Request.handle_unit_response resp diff --git a/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.mli b/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.mli index 259a66dd29e0..90ee24fed945 100644 --- a/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.mli +++ b/samples/client/petstore/ocaml-fake-petstore/src/apis/fake_api.mli @@ -19,7 +19,7 @@ val test_body_with_file_schema : file_schema_test_class_t:File_schema_test_class val test_body_with_query_params : query:string -> user_t:User.t -> unit Lwt.t val test_client_model : client_t:Client.t -> Client.t Lwt.t val test_endpoint_parameters : number:float -> double:float -> pattern_without_delimiter:string -> byte:string -> ?integer:int32 -> ?int32:int32 -> ?int64:int64 -> ?float:float -> ?string:string -> ?binary:string -> ?date:string -> ?date_time:string -> ?password:string -> ?callback:string -> unit -> unit Lwt.t -val test_enum_parameters : ?enum_header_string_array:Enums.enum_form_string_array list -> ?enum_header_string:Enums.enumclass -> ?enum_query_string_array:Enums.enum_form_string_array list -> ?enum_query_string:Enums.enumclass -> ?enum_query_integer:Enums.enum_query_integer -> ?enum_query_double:Enums.enum_number -> ?enum_query_model_array:Enums.enumclass list -> ?enum_form_string_array:Enums.enum_form_string_array list -> ?enum_form_string:Enums.enumclass -> unit -> unit Lwt.t +val test_enum_parameters : ?enum_header_string_array:Enums.enum_form_string_array list -> ?enum_header_string:Enums.enumclass -> ?enum_query_string_array:Enums.enum_form_string_array list -> ?enum_query_string:Enums.enumclass -> ?enum_query_integer:Enums.enum_query_integer -> ?enum_query_double:Enums.enum_number -> ?enum_query_model_array:Enums.enumclass list -> ?enum_form_string_array:Enums.enum_form_string_array list -> ?enum_form_string:Enums.enumclass -> ?enum_form_integer:Enums.enum_form_integer -> ?enum_form_double:Enums.enum_form_double -> unit -> unit Lwt.t val test_group_parameters : required_string_group:int32 -> required_boolean_group:bool -> required_int64_group:int64 -> ?string_group:int32 -> ?boolean_group:bool -> ?int64_group:int64 -> unit -> unit Lwt.t val test_inline_additional_properties : request_body:(string * string) list -> unit Lwt.t val test_inline_freeform_additional_properties : test_inline_freeform_additional_properties_request_t:Test_inline_freeform_additional_properties_request.t -> unit Lwt.t diff --git a/samples/client/petstore/ocaml-fake-petstore/src/models/order.ml b/samples/client/petstore/ocaml-fake-petstore/src/models/order.ml index 3d40c904734f..ec3b5c974807 100644 --- a/samples/client/petstore/ocaml-fake-petstore/src/models/order.ml +++ b/samples/client/petstore/ocaml-fake-petstore/src/models/order.ml @@ -46,7 +46,21 @@ ; [@key "complete"] - } [@@deriving yojson { strict = false }, show, eq ];; + payment_method: Enums.paymentmethod + option [@default + Some(`_1) + + ] + ; [@key "paymentMethod"] + (** Various payment methods *) + order_status: Enums.orderstatus + option [@default + + None + ] + ; [@key "OrderStatus"] + (** Order status *) + } [@@deriving yojson { strict = false }, show, eq ];; let create () : t = { id = None; @@ -55,6 +69,8 @@ ship_date = None; status = None; complete = None; + payment_method = None; + order_status = None; } diff --git a/samples/client/petstore/ocaml-fake-petstore/src/support/enums.ml b/samples/client/petstore/ocaml-fake-petstore/src/support/enums.ml index 38b8eb297499..f038212ccdd4 100644 --- a/samples/client/petstore/ocaml-fake-petstore/src/support/enums.ml +++ b/samples/client/petstore/ocaml-fake-petstore/src/support/enums.ml @@ -17,6 +17,17 @@ let outerenuminteger_to_yojson e = | `List [json] -> json | json -> json +type orderstatus = [ +| `PENDING [@printer fun fmt _ -> Format.pp_print_string fmt "PENDING"] [@name "PENDING"] +| `PROCESSING [@printer fun fmt _ -> Format.pp_print_string fmt "PROCESSING"] [@name "PROCESSING"] +] [@@deriving yojson, show { with_path = false }, eq];; + +let orderstatus_of_yojson json = orderstatus_of_yojson (`List [json]) +let orderstatus_to_yojson e = + match orderstatus_to_yojson e with + | `List [json] -> json + | json -> json + type map_of_enum_string = [ | `UPPER [@printer fun fmt _ -> Format.pp_print_string fmt "UPPER"] [@name "UPPER"] | `Lower [@printer fun fmt _ -> Format.pp_print_string fmt "lower"] [@name "lower"] @@ -74,6 +85,19 @@ let status_to_yojson e = | `List [json] -> json | json -> json +type enum_form_double = [ +| `_1Period1 [@printer fun fmt _ -> Format.pp_print_string fmt "1.1"] [@name "1.1"] +| `Minus1Period1 [@printer fun fmt _ -> Format.pp_print_string fmt "-1.1"] [@name "-1.1"] +| `_0Period1 [@printer fun fmt _ -> Format.pp_print_string fmt "0.1"] [@name "0.1"] +| `_0Period0 [@printer fun fmt _ -> Format.pp_print_string fmt "0.0"] [@name "0.0"] +] [@@deriving yojson, show { with_path = false }, eq];; + +let enum_form_double_of_yojson json = enum_form_double_of_yojson (`List [json]) +let enum_form_double_to_yojson e = + match enum_form_double_to_yojson e with + | `List [json] -> json + | json -> json + type order_status = [ | `Placed [@printer fun fmt _ -> Format.pp_print_string fmt "placed"] [@name "placed"] | `Approved [@printer fun fmt _ -> Format.pp_print_string fmt "approved"] [@name "approved"] @@ -129,6 +153,17 @@ let enum_number_to_yojson e = | `List [json] -> json | json -> json +type paymentmethod = [ +| `_1 [@printer fun fmt _ -> Format.pp_print_string fmt "1"] [@name "1"] +| `_2 [@printer fun fmt _ -> Format.pp_print_string fmt "2"] [@name "2"] +] [@@deriving yojson, show { with_path = false }, eq];; + +let paymentmethod_of_yojson json = paymentmethod_of_yojson (`List [json]) +let paymentmethod_to_yojson e = + match paymentmethod_to_yojson e with + | `List [json] -> json + | json -> json + type array_enum = [ | `Fish [@printer fun fmt _ -> Format.pp_print_string fmt "fish"] [@name "fish"] | `Crab [@printer fun fmt _ -> Format.pp_print_string fmt "crab"] [@name "crab"] @@ -140,6 +175,18 @@ let array_enum_to_yojson e = | `List [json] -> json | json -> json +type enum_form_integer = [ +| `_1 [@printer fun fmt _ -> Format.pp_print_string fmt "1"] [@name "1"] +| `Minus1 [@printer fun fmt _ -> Format.pp_print_string fmt "-1"] [@name "-1"] +| `_0 [@printer fun fmt _ -> Format.pp_print_string fmt "0"] [@name "0"] +] [@@deriving yojson, show { with_path = false }, eq];; + +let enum_form_integer_of_yojson json = enum_form_integer_of_yojson (`List [json]) +let enum_form_integer_to_yojson e = + match enum_form_integer_to_yojson e with + | `List [json] -> json + | json -> json + type singlereftype = [ | `Admin [@printer fun fmt _ -> Format.pp_print_string fmt "admin"] [@name "admin"] | `User [@printer fun fmt _ -> Format.pp_print_string fmt "user"] [@name "user"] diff --git a/samples/client/petstore/ruby-autoload/docs/FakeApi.md b/samples/client/petstore/ruby-autoload/docs/FakeApi.md index 4262104d12af..ae7f5c8286a1 100644 --- a/samples/client/petstore/ruby-autoload/docs/FakeApi.md +++ b/samples/client/petstore/ruby-autoload/docs/FakeApi.md @@ -983,7 +983,9 @@ opts = { enum_query_double: 1.1, # Float | Query parameter enum test (double) enum_query_model_array: [Petstore::EnumClass::ABC], # Array | enum_form_string_array: ['>'], # Array | Form parameter enum test (string array) - enum_form_string: '_abc' # String | Form parameter enum test (string) + enum_form_string: '_abc', # String | Form parameter enum test (string) + enum_form_integer: 1, # Integer | Form parameter enum test (integer) + enum_form_double: 1.1 # Float | Form parameter enum test (double) } begin @@ -1025,6 +1027,8 @@ end | **enum_query_model_array** | [**Array<EnumClass>**](EnumClass.md) | | [optional] | | **enum_form_string_array** | [**Array<String>**](String.md) | Form parameter enum test (string array) | [optional][default to '$'] | | **enum_form_string** | **String** | Form parameter enum test (string) | [optional][default to '-efg'] | +| **enum_form_integer** | **Integer** | Form parameter enum test (integer) | [optional][default to 1] | +| **enum_form_double** | **Float** | Form parameter enum test (double) | [optional][default to 1.1] | ### Return type diff --git a/samples/client/petstore/ruby-autoload/docs/Order.md b/samples/client/petstore/ruby-autoload/docs/Order.md index a3fd55138068..cf618891943e 100644 --- a/samples/client/petstore/ruby-autoload/docs/Order.md +++ b/samples/client/petstore/ruby-autoload/docs/Order.md @@ -10,6 +10,8 @@ | **ship_date** | **Time** | | [optional] | | **status** | **String** | Order Status | [optional] | | **complete** | **Boolean** | | [optional][default to false] | +| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] | +| **order_status** | **Object** | Order status | [optional] | ## Example @@ -22,7 +24,9 @@ instance = Petstore::Order.new( quantity: null, ship_date: null, status: null, - complete: null + complete: null, + payment_method: 1, + order_status: null ) ``` diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb index bb3e258fdaa3..86dd597a2308 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/api/fake_api.rb @@ -1024,6 +1024,8 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [Array] :enum_query_model_array # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') + # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1) + # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1) # @return [nil] def test_enum_parameters(opts = {}) test_enum_parameters_with_http_info(opts) @@ -1042,6 +1044,8 @@ def test_enum_parameters(opts = {}) # @option opts [Array] :enum_query_model_array # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') + # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1) + # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1) # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers def test_enum_parameters_with_http_info(opts = {}) if @api_client.config.debugging @@ -1079,6 +1083,14 @@ def test_enum_parameters_with_http_info(opts = {}) if @api_client.config.client_side_validation && opts[:'enum_form_string'] && !allowable_values.include?(opts[:'enum_form_string']) fail ArgumentError, "invalid value for \"enum_form_string\", must be one of #{allowable_values}" end + allowable_values = [1, -1, 0] + if @api_client.config.client_side_validation && opts[:'enum_form_integer'] && !allowable_values.include?(opts[:'enum_form_integer']) + fail ArgumentError, "invalid value for \"enum_form_integer\", must be one of #{allowable_values}" + end + allowable_values = [1.1, -1.1, 0.1, 0.0] + if @api_client.config.client_side_validation && opts[:'enum_form_double'] && !allowable_values.include?(opts[:'enum_form_double']) + fail ArgumentError, "invalid value for \"enum_form_double\", must be one of #{allowable_values}" + end # resource path local_var_path = '/fake' @@ -1104,6 +1116,8 @@ def test_enum_parameters_with_http_info(opts = {}) form_params = opts[:form_params] || {} form_params['enum_form_string_array'] = @api_client.build_collection_param(opts[:'enum_form_string_array'], :csv) if !opts[:'enum_form_string_array'].nil? form_params['enum_form_string'] = opts[:'enum_form_string'] if !opts[:'enum_form_string'].nil? + form_params['enum_form_integer'] = opts[:'enum_form_integer'] if !opts[:'enum_form_integer'].nil? + form_params['enum_form_double'] = opts[:'enum_form_double'] if !opts[:'enum_form_double'].nil? # http body (model) post_body = opts[:debug_body] diff --git a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb index 9a9035ac5345..1e95b503897a 100644 --- a/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-autoload/lib/petstore/models/order.rb @@ -28,6 +28,12 @@ class Order attr_accessor :complete + # Various payment methods + attr_accessor :payment_method + + # Order status + attr_accessor :order_status + class EnumAttributeValidator attr_reader :datatype attr_reader :allowable_values @@ -58,7 +64,9 @@ def self.attribute_map :'quantity' => :'quantity', :'ship_date' => :'shipDate', :'status' => :'status', - :'complete' => :'complete' + :'complete' => :'complete', + :'payment_method' => :'paymentMethod', + :'order_status' => :'OrderStatus' } end @@ -80,7 +88,9 @@ def self.openapi_types :'quantity' => :'Integer', :'ship_date' => :'Time', :'status' => :'String', - :'complete' => :'Boolean' + :'complete' => :'Boolean', + :'payment_method' => :'Float', + :'order_status' => :'Object' } end @@ -131,6 +141,16 @@ def initialize(attributes = {}) else self.complete = false end + + if attributes.key?(:'payment_method') + self.payment_method = attributes[:'payment_method'] + else + self.payment_method = PAYMENT_METHOD::N1 + end + + if attributes.key?(:'order_status') + self.order_status = attributes[:'order_status'] + end end # Show invalid properties with the reasons. Usually used together with valid? @@ -147,6 +167,10 @@ def valid? warn '[DEPRECATED] the `valid?` method is obsolete' status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"]) return false unless status_validator.valid?(@status) + payment_method_validator = EnumAttributeValidator.new('Float', [1, 2]) + return false unless payment_method_validator.valid?(@payment_method) + order_status_validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"]) + return false unless order_status_validator.valid?(@order_status) true end @@ -160,6 +184,26 @@ def status=(status) @status = status end + # Custom attribute writer method checking allowed values (enum). + # @param [Object] payment_method Object to be assigned + def payment_method=(payment_method) + validator = EnumAttributeValidator.new('Float', [1, 2]) + unless validator.valid?(payment_method) + fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}." + end + @payment_method = payment_method + end + + # Custom attribute writer method checking allowed values (enum). + # @param [Object] order_status Object to be assigned + def order_status=(order_status) + validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"]) + unless validator.valid?(order_status) + fail ArgumentError, "invalid value for \"order_status\", must be one of #{validator.allowable_values}." + end + @order_status = order_status + end + # Checks equality by comparing each attribute. # @param [Object] Object to be compared def ==(o) @@ -170,7 +214,9 @@ def ==(o) quantity == o.quantity && ship_date == o.ship_date && status == o.status && - complete == o.complete + complete == o.complete && + payment_method == o.payment_method && + order_status == o.order_status end # @see the `==` method @@ -182,7 +228,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [id, pet_id, quantity, ship_date, status, complete].hash + [id, pet_id, quantity, ship_date, status, complete, payment_method, order_status].hash end # Builds the object from hash diff --git a/samples/client/petstore/ruby-faraday/docs/FakeApi.md b/samples/client/petstore/ruby-faraday/docs/FakeApi.md index 4262104d12af..ae7f5c8286a1 100644 --- a/samples/client/petstore/ruby-faraday/docs/FakeApi.md +++ b/samples/client/petstore/ruby-faraday/docs/FakeApi.md @@ -983,7 +983,9 @@ opts = { enum_query_double: 1.1, # Float | Query parameter enum test (double) enum_query_model_array: [Petstore::EnumClass::ABC], # Array | enum_form_string_array: ['>'], # Array | Form parameter enum test (string array) - enum_form_string: '_abc' # String | Form parameter enum test (string) + enum_form_string: '_abc', # String | Form parameter enum test (string) + enum_form_integer: 1, # Integer | Form parameter enum test (integer) + enum_form_double: 1.1 # Float | Form parameter enum test (double) } begin @@ -1025,6 +1027,8 @@ end | **enum_query_model_array** | [**Array<EnumClass>**](EnumClass.md) | | [optional] | | **enum_form_string_array** | [**Array<String>**](String.md) | Form parameter enum test (string array) | [optional][default to '$'] | | **enum_form_string** | **String** | Form parameter enum test (string) | [optional][default to '-efg'] | +| **enum_form_integer** | **Integer** | Form parameter enum test (integer) | [optional][default to 1] | +| **enum_form_double** | **Float** | Form parameter enum test (double) | [optional][default to 1.1] | ### Return type diff --git a/samples/client/petstore/ruby-faraday/docs/Order.md b/samples/client/petstore/ruby-faraday/docs/Order.md index a3fd55138068..cf618891943e 100644 --- a/samples/client/petstore/ruby-faraday/docs/Order.md +++ b/samples/client/petstore/ruby-faraday/docs/Order.md @@ -10,6 +10,8 @@ | **ship_date** | **Time** | | [optional] | | **status** | **String** | Order Status | [optional] | | **complete** | **Boolean** | | [optional][default to false] | +| **payment_method** | **Float** | Various payment methods | [optional][default to PAYMENT_METHOD::N1] | +| **order_status** | **Object** | Order status | [optional] | ## Example @@ -22,7 +24,9 @@ instance = Petstore::Order.new( quantity: null, ship_date: null, status: null, - complete: null + complete: null, + payment_method: 1, + order_status: null ) ``` diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index bb3e258fdaa3..86dd597a2308 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -1024,6 +1024,8 @@ def test_endpoint_parameters_with_http_info(number, double, pattern_without_deli # @option opts [Array] :enum_query_model_array # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') + # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1) + # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1) # @return [nil] def test_enum_parameters(opts = {}) test_enum_parameters_with_http_info(opts) @@ -1042,6 +1044,8 @@ def test_enum_parameters(opts = {}) # @option opts [Array] :enum_query_model_array # @option opts [Array] :enum_form_string_array Form parameter enum test (string array) (default to '$') # @option opts [String] :enum_form_string Form parameter enum test (string) (default to '-efg') + # @option opts [Integer] :enum_form_integer Form parameter enum test (integer) (default to 1) + # @option opts [Float] :enum_form_double Form parameter enum test (double) (default to 1.1) # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers def test_enum_parameters_with_http_info(opts = {}) if @api_client.config.debugging @@ -1079,6 +1083,14 @@ def test_enum_parameters_with_http_info(opts = {}) if @api_client.config.client_side_validation && opts[:'enum_form_string'] && !allowable_values.include?(opts[:'enum_form_string']) fail ArgumentError, "invalid value for \"enum_form_string\", must be one of #{allowable_values}" end + allowable_values = [1, -1, 0] + if @api_client.config.client_side_validation && opts[:'enum_form_integer'] && !allowable_values.include?(opts[:'enum_form_integer']) + fail ArgumentError, "invalid value for \"enum_form_integer\", must be one of #{allowable_values}" + end + allowable_values = [1.1, -1.1, 0.1, 0.0] + if @api_client.config.client_side_validation && opts[:'enum_form_double'] && !allowable_values.include?(opts[:'enum_form_double']) + fail ArgumentError, "invalid value for \"enum_form_double\", must be one of #{allowable_values}" + end # resource path local_var_path = '/fake' @@ -1104,6 +1116,8 @@ def test_enum_parameters_with_http_info(opts = {}) form_params = opts[:form_params] || {} form_params['enum_form_string_array'] = @api_client.build_collection_param(opts[:'enum_form_string_array'], :csv) if !opts[:'enum_form_string_array'].nil? form_params['enum_form_string'] = opts[:'enum_form_string'] if !opts[:'enum_form_string'].nil? + form_params['enum_form_integer'] = opts[:'enum_form_integer'] if !opts[:'enum_form_integer'].nil? + form_params['enum_form_double'] = opts[:'enum_form_double'] if !opts[:'enum_form_double'].nil? # http body (model) post_body = opts[:debug_body] diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb index 9a9035ac5345..1e95b503897a 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb @@ -28,6 +28,12 @@ class Order attr_accessor :complete + # Various payment methods + attr_accessor :payment_method + + # Order status + attr_accessor :order_status + class EnumAttributeValidator attr_reader :datatype attr_reader :allowable_values @@ -58,7 +64,9 @@ def self.attribute_map :'quantity' => :'quantity', :'ship_date' => :'shipDate', :'status' => :'status', - :'complete' => :'complete' + :'complete' => :'complete', + :'payment_method' => :'paymentMethod', + :'order_status' => :'OrderStatus' } end @@ -80,7 +88,9 @@ def self.openapi_types :'quantity' => :'Integer', :'ship_date' => :'Time', :'status' => :'String', - :'complete' => :'Boolean' + :'complete' => :'Boolean', + :'payment_method' => :'Float', + :'order_status' => :'Object' } end @@ -131,6 +141,16 @@ def initialize(attributes = {}) else self.complete = false end + + if attributes.key?(:'payment_method') + self.payment_method = attributes[:'payment_method'] + else + self.payment_method = PAYMENT_METHOD::N1 + end + + if attributes.key?(:'order_status') + self.order_status = attributes[:'order_status'] + end end # Show invalid properties with the reasons. Usually used together with valid? @@ -147,6 +167,10 @@ def valid? warn '[DEPRECATED] the `valid?` method is obsolete' status_validator = EnumAttributeValidator.new('String', ["placed", "approved", "delivered"]) return false unless status_validator.valid?(@status) + payment_method_validator = EnumAttributeValidator.new('Float', [1, 2]) + return false unless payment_method_validator.valid?(@payment_method) + order_status_validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"]) + return false unless order_status_validator.valid?(@order_status) true end @@ -160,6 +184,26 @@ def status=(status) @status = status end + # Custom attribute writer method checking allowed values (enum). + # @param [Object] payment_method Object to be assigned + def payment_method=(payment_method) + validator = EnumAttributeValidator.new('Float', [1, 2]) + unless validator.valid?(payment_method) + fail ArgumentError, "invalid value for \"payment_method\", must be one of #{validator.allowable_values}." + end + @payment_method = payment_method + end + + # Custom attribute writer method checking allowed values (enum). + # @param [Object] order_status Object to be assigned + def order_status=(order_status) + validator = EnumAttributeValidator.new('Object', ["PENDING", "PROCESSING"]) + unless validator.valid?(order_status) + fail ArgumentError, "invalid value for \"order_status\", must be one of #{validator.allowable_values}." + end + @order_status = order_status + end + # Checks equality by comparing each attribute. # @param [Object] Object to be compared def ==(o) @@ -170,7 +214,9 @@ def ==(o) quantity == o.quantity && ship_date == o.ship_date && status == o.status && - complete == o.complete + complete == o.complete && + payment_method == o.payment_method && + order_status == o.order_status end # @see the `==` method @@ -182,7 +228,7 @@ def eql?(o) # Calculates hash code according to all attributes. # @return [Integer] Hash code def hash - [id, pet_id, quantity, ship_date, status, complete].hash + [id, pet_id, quantity, ship_date, status, complete, payment_method, order_status].hash end # Builds the object from hash diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts index 72800d8405f2..e4789e3a24a4 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts @@ -126,6 +126,8 @@ export interface TestEnumParametersRequest { enumQueryModelArray?: Array; enumFormStringArray?: Array; enumFormString?: TestEnumParametersEnumFormStringEnum; + enumFormInteger?: TestEnumParametersEnumFormIntegerEnum; + enumFormDouble?: TestEnumParametersEnumFormDoubleEnum; } export interface TestGroupParametersRequest { @@ -853,6 +855,14 @@ export class FakeApi extends runtime.BaseAPI { formParams.append('enum_form_string', requestParameters['enumFormString'] as any); } + if (requestParameters['enumFormInteger'] != null) { + formParams.append('enum_form_integer', requestParameters['enumFormInteger'] as any); + } + + if (requestParameters['enumFormDouble'] != null) { + formParams.append('enum_form_double', requestParameters['enumFormDouble'] as any); + } + let urlPath = `/fake`; @@ -1352,3 +1362,22 @@ export const TestEnumParametersEnumFormStringEnum = { Xyz: '(xyz)' } as const; export type TestEnumParametersEnumFormStringEnum = typeof TestEnumParametersEnumFormStringEnum[keyof typeof TestEnumParametersEnumFormStringEnum]; +/** + * @export + */ +export const TestEnumParametersEnumFormIntegerEnum = { + NUMBER_1: 1, + NUMBER_MINUS_1: -1, + NUMBER_0: 0 +} as const; +export type TestEnumParametersEnumFormIntegerEnum = typeof TestEnumParametersEnumFormIntegerEnum[keyof typeof TestEnumParametersEnumFormIntegerEnum]; +/** + * @export + */ +export const TestEnumParametersEnumFormDoubleEnum = { + NUMBER_1_DOT_1: 1.1, + NUMBER_MINUS_1_DOT_1: -1.1, + NUMBER_0_DOT_1: 0.1, + NUMBER_0_DOT_0: 0.0 +} as const; +export type TestEnumParametersEnumFormDoubleEnum = typeof TestEnumParametersEnumFormDoubleEnum[keyof typeof TestEnumParametersEnumFormDoubleEnum]; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts index 9444d5346722..5bf6abdbceeb 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/Order.ts @@ -55,6 +55,18 @@ export interface Order { * @memberof Order */ complete?: boolean; + /** + * Various payment methods + * @type {number} + * @memberof Order + */ + paymentMethod?: OrderPaymentMethodEnum; + /** + * Order status + * @type {object} + * @memberof Order + */ + orderStatus?: OrderOrderStatusEnum; } @@ -68,6 +80,24 @@ export const OrderStatusEnum = { } as const; export type OrderStatusEnum = typeof OrderStatusEnum[keyof typeof OrderStatusEnum]; +/** + * @export + */ +export const OrderPaymentMethodEnum = { + NUMBER_1: 1, + NUMBER_2: 2 +} as const; +export type OrderPaymentMethodEnum = typeof OrderPaymentMethodEnum[keyof typeof OrderPaymentMethodEnum]; + +/** + * @export + */ +export const OrderOrderStatusEnum = { + Pending: 'PENDING', + Processing: 'PROCESSING' +} as const; +export type OrderOrderStatusEnum = typeof OrderOrderStatusEnum[keyof typeof OrderOrderStatusEnum]; + /** * Check if a given object implements the Order interface. @@ -92,6 +122,8 @@ export function OrderFromJSONTyped(json: any, ignoreDiscriminator: boolean): Ord 'shipDate': json['shipDate'] == null ? undefined : (new Date(json['shipDate'])), 'status': json['status'] == null ? undefined : json['status'], 'complete': json['complete'] == null ? undefined : json['complete'], + 'paymentMethod': json['paymentMethod'] == null ? undefined : json['paymentMethod'], + 'orderStatus': json['OrderStatus'] == null ? undefined : json['OrderStatus'], }; } @@ -112,6 +144,8 @@ export function OrderToJSONTyped(value?: Order | null, ignoreDiscriminator: bool 'shipDate': value['shipDate'] == null ? value['shipDate'] : value['shipDate'].toISOString(), 'status': value['status'], 'complete': value['complete'], + 'paymentMethod': value['paymentMethod'], + 'OrderStatus': value['orderStatus'], }; } 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 7ad90be61c6c..8524f1f0a5c1 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; diff --git a/samples/schema/petstore/mysql/Model/Order.sql b/samples/schema/petstore/mysql/Model/Order.sql index 43af471ffb5c..efe3b21b4ffe 100644 --- a/samples/schema/petstore/mysql/Model/Order.sql +++ b/samples/schema/petstore/mysql/Model/Order.sql @@ -7,17 +7,17 @@ -- -- SELECT template for table `Order` -- -SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete` FROM `Order` WHERE 1; +SELECT `id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`, `OrderStatus` FROM `Order` WHERE 1; -- -- INSERT template for table `Order` -- -INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`) VALUES (?, ?, ?, ?, ?, ?); +INSERT INTO `Order`(`id`, `petId`, `quantity`, `shipDate`, `status`, `complete`, `paymentMethod`, `OrderStatus`) VALUES (?, ?, ?, ?, ?, ?, ?, ?); -- -- UPDATE template for table `Order` -- -UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ? WHERE 1; +UPDATE `Order` SET `id` = ?, `petId` = ?, `quantity` = ?, `shipDate` = ?, `status` = ?, `complete` = ?, `paymentMethod` = ?, `OrderStatus` = ? WHERE 1; -- -- DELETE template for table `Order` diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql index 0c526bdabd3e..39646b1f0c31 100644 --- a/samples/schema/petstore/mysql/mysql_schema.sql +++ b/samples/schema/petstore/mysql/mysql_schema.sql @@ -352,7 +352,9 @@ CREATE TABLE IF NOT EXISTS `Order` ( `quantity` INT DEFAULT NULL, `shipDate` DATETIME DEFAULT NULL, `status` ENUM('placed', 'approved', 'delivered') DEFAULT NULL COMMENT 'Order Status', - `complete` TINYINT(1) DEFAULT false + `complete` TINYINT(1) DEFAULT false, + `paymentMethod` ENUM('1', '2') DEFAULT '1' COMMENT 'Various payment methods', + `OrderStatus` JSON DEFAULT NULL COMMENT 'Order status' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp index cb69bcfd7e4b..09678e1b30c0 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp @@ -1668,6 +1668,8 @@ void FakeResource::handler_GET_internal(const std::shared_ptr std::vector enumFormStringArray; boost::split(enumFormStringArray, enumFormStringArray_raw, boost::is_any_of(",")); auto enumFormString = boost::lexical_cast(extractFormParamsFromBody("enumFormString", extractBodyContent(session))); + auto enumFormInteger = boost::lexical_cast(extractFormParamsFromBody("enumFormInteger", extractBodyContent(session))); + auto enumFormDouble = boost::lexical_cast(extractFormParamsFromBody("enumFormDouble", extractBodyContent(session))); // Getting the query params std::string enumQueryStringArray_raw = request->get_query_parameter("enumQueryStringArray"); std::vector enumQueryStringArray; @@ -1693,7 +1695,7 @@ void FakeResource::handler_GET_internal(const std::shared_ptr try { status_code = - handler_GET(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + handler_GET(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } catch(const FakeApiException& e) { std::tie(status_code, result) = handleFakeApiException(e); @@ -1791,9 +1793,9 @@ int FakeResource::handler_POST( return handler_POST_func(number, r_double, patternWithoutDelimiter, byte, integer, int32, int64, r_float, string, binary, date, dateTime, password, callback); } int FakeResource::handler_GET( - std::vector & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString) + std::vector & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble) { - return handler_GET_func(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); + return handler_GET_func(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble); } int FakeResource::handler_DELETE( int32_t & requiredStringGroup, bool & requiredBooleanGroup, int64_t & requiredInt64Group, int32_t & stringGroup, bool & booleanGroup, int64_t & int64Group) diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h index 0093a84eb85a..0bf0da2202bc 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h @@ -848,8 +848,8 @@ class FakeResource: public restbed::Resource { throw FakeApiException(501, "Not implemented"); }; std::function & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString)> handler_GET_func = - [](std::vector &, std::string &, std::vector &, std::string &, int32_t &, double &, std::vector &, std::vector &, std::string &) -> int + std::vector & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble)> handler_GET_func = + [](std::vector &, std::string &, std::vector &, std::string &, int32_t &, double &, std::vector &, std::vector &, std::string &, int32_t &, double &) -> int { throw FakeApiException(501, "Not implemented"); }; std::function & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString); + std::vector & enumHeaderStringArray, std::string & enumHeaderString, std::vector & enumQueryStringArray, std::string & enumQueryString, int32_t & enumQueryInteger, double & enumQueryDouble, std::vector & enumQueryModelArray, std::vector & enumFormStringArray, std::string & enumFormString, int32_t & enumFormInteger, double & enumFormDouble); virtual int handler_DELETE( int32_t & requiredStringGroup, bool & requiredBooleanGroup, int64_t & requiredInt64Group, int32_t & stringGroup, bool & booleanGroup, int64_t & int64Group); diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp index d7e13bc44720..5023406926d9 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.cpp @@ -69,6 +69,7 @@ ptree Order::toPropertyTree() const pt.put("shipDate", m_ShipDate); pt.put("status", m_Status); pt.put("complete", m_Complete); + pt.put("paymentMethod", m_PaymentMethod); return pt; } @@ -81,6 +82,8 @@ void Order::fromPropertyTree(ptree const &pt) m_ShipDate = pt.get("shipDate", ""); setStatus(pt.get("status", "")); m_Complete = pt.get("complete", false); + setPaymentMethod(pt.get("paymentMethod", 1)); + setOrderStatus(pt.get("OrderStatus", std::string{})); } int64_t Order::getId() const @@ -157,6 +160,44 @@ void Order::setComplete(bool value) } +double Order::getPaymentMethod() const +{ + return m_PaymentMethod; +} + +void Order::setPaymentMethod(double value) +{ + static const std::array allowedValues = { + 1, 2 + }; + + if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) { + m_PaymentMethod = value; + } else { + throw std::runtime_error("Value " + boost::lexical_cast(value) + " not allowed"); + } +} + + +std::string Order::getOrderStatus() const +{ + return m_OrderStatus; +} + +void Order::setOrderStatus(std::string value) +{ + static const std::array allowedValues = { + "PENDING", "PROCESSING" + }; + + if (std::find(allowedValues.begin(), allowedValues.end(), value) != allowedValues.end()) { + m_OrderStatus = value; + } else { + throw std::runtime_error("Value " + boost::lexical_cast(value) + " not allowed"); + } +} + + std::vector createOrderVectorFromJsonString(const std::string& json) { diff --git a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h index 2060af215faa..ca7fda89506c 100644 --- a/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h +++ b/samples/server/petstore/cpp-restbed/generated/3_0/model/Order.h @@ -94,6 +94,18 @@ class Order bool isComplete() const; void setComplete(bool value); + /// + /// Various payment methods + /// + double getPaymentMethod() const; + void setPaymentMethod(double value); + + /// + /// Order status + /// + std::string getOrderStatus() const; + void setOrderStatus(std::string value); + protected: int64_t m_Id = 0L; int64_t m_PetId = 0L; @@ -101,6 +113,8 @@ class Order std::string m_ShipDate = ""; std::string m_Status = ""; bool m_Complete = false; + double m_PaymentMethod = 1; + std::string m_OrderStatus = std::string{}; }; std::vector createOrderVectorFromJsonString(const std::string& json); diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java index 36933627981c..7eedb7b0a322 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java @@ -118,7 +118,7 @@ public interface FakeService { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray, @FormParam(value = "enum_form_string") String enumFormString); + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray, @FormParam(value = "enum_form_string") String enumFormString, @FormParam(value = "enum_form_integer") Integer enumFormInteger, @FormParam(value = "enum_form_double") BigDecimal enumFormDouble); @DELETE void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group") Boolean booleanGroup, @QueryParam("int64_group") Long int64Group); diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java index e0759440b707..966616b714d7 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java @@ -149,7 +149,7 @@ public void testEndpointParameters(@FormParam(value = "number") BigDecimal numb @GET @Consumes({ "application/x-www-form-urlencoded" }) - public void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@FormParam(value = "enum_form_integer") Integer enumFormInteger,@FormParam(value = "enum_form_double") BigDecimal enumFormDouble) { } @DELETE diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java index 9476edffbf91..9e3ea40c4366 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/EnumTest.java @@ -131,7 +131,7 @@ public static EnumStringRequiredEnum fromValue(String value) { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); private Integer value; @@ -180,7 +180,7 @@ public static EnumIntegerEnum fromValue(Integer value) { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); private Double value; diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java index 707cdd3797f9..a6d99b32bb0e 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/Order.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -88,6 +89,110 @@ public static StatusEnum fromValue(String value) { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2")); + + + private BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into BigDecimal, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static PaymentMethodEnum fromString(String s) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @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 + "'"); + } +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + + private Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into Object, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static OrderStatusEnum fromString(String s) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -208,6 +313,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -223,6 +368,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java index 0ca5e240f6f6..702165a01c9e 100644 --- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/Order.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) { private StatusEnum status; 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(String text) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + + @JsonCreator + public static OrderStatusEnum fromValue(String text) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private OrderStatusEnum orderStatus; + /** * Default constructor. */ @@ -71,6 +148,8 @@ public Order() { * @param shipDate shipDate * @param status Order Status * @param complete complete + * @param paymentMethod Various payment methods + * @param orderStatus Order status */ public Order( Long id, @@ -78,7 +157,9 @@ public Order( Integer quantity, OffsetDateTime shipDate, StatusEnum status, - Boolean complete + Boolean complete, + PaymentMethodEnum paymentMethod, + OrderStatusEnum orderStatus ) { this.id = id; this.petId = petId; @@ -86,6 +167,8 @@ public Order( this.shipDate = shipDate; this.status = status; this.complete = complete; + this.paymentMethod = paymentMethod; + this.orderStatus = orderStatus; } @@ -162,6 +245,30 @@ public void setComplete(Boolean complete) { this.complete = complete; } + /** + * Various payment methods + * @return paymentMethod + */ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + /** + * Order status + * @return orderStatus + */ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + /** * Create a string representation of this pojo. **/ @@ -176,6 +283,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java index 78156d070513..1466f3b5e802 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java @@ -119,7 +119,7 @@ public interface FakeService { @GET @Consumes({ "application/x-www-form-urlencoded" }) - void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray, @FormParam(value = "enum_form_string") String enumFormString); + void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray, @HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray, @FormParam(value = "enum_form_string") String enumFormString, @FormParam(value = "enum_form_integer") Integer enumFormInteger, @FormParam(value = "enum_form_double") BigDecimal enumFormDouble); @DELETE void testGroupParameters(@QueryParam("required_string_group") @NotNull Integer requiredStringGroup, @HeaderParam("required_boolean_group") @NotNull Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull Long requiredInt64Group, @QueryParam("string_group") Integer stringGroup, @HeaderParam("boolean_group") Boolean booleanGroup, @QueryParam("int64_group") Long int64Group); diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java index 0f79673b2196..fdae3221ca0a 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java @@ -150,7 +150,7 @@ public void testEndpointParameters(@FormParam(value = "number") BigDecimal numb @GET @Consumes({ "application/x-www-form-urlencoded" }) - public void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public void testEnumParameters(@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@HeaderParam("enum_header_string") @DefaultValue("-efg") 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(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@FormParam(value = "enum_form_integer") Integer enumFormInteger,@FormParam(value = "enum_form_double") BigDecimal enumFormDouble) { } @DELETE diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java index 9476edffbf91..9e3ea40c4366 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/EnumTest.java @@ -131,7 +131,7 @@ public static EnumStringRequiredEnum fromValue(String value) { public enum EnumIntegerEnum { - NUMBER_1(Integer.valueOf(1)), NUMBER_MINUS_1(Integer.valueOf(-1)); + NUMBER_1(1), NUMBER_MINUS_1(-1); private Integer value; @@ -180,7 +180,7 @@ public static EnumIntegerEnum fromValue(Integer value) { public enum EnumNumberEnum { - NUMBER_1_DOT_1(Double.valueOf(1.1)), NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2)); + NUMBER_1_DOT_1(1.1), NUMBER_MINUS_1_DOT_2(-1.2); private Double value; diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java index 707cdd3797f9..a6d99b32bb0e 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/Order.java @@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -88,6 +89,110 @@ public static StatusEnum fromValue(String value) { private Boolean complete = false; +public enum PaymentMethodEnum { + + NUMBER_1(new BigDecimal("1")), NUMBER_2(new BigDecimal("2")); + + + private BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into BigDecimal, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static PaymentMethodEnum fromString(String s) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @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 + "'"); + } +} + + /** + * Various payment methods + **/ + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + +public enum OrderStatusEnum { + + PENDING("PENDING"), PROCESSING("PROCESSING"); + + + private Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into Object, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static OrderStatusEnum fromString(String s) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + /** + * Order status + **/ + private OrderStatusEnum orderStatus; + /** * Get id * @return id @@ -208,6 +313,46 @@ 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; + } + + /** + * Order status + * @return orderStatus + **/ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + /** + * Set orderStatus + **/ + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + /** * Create a string representation of this pojo. @@ -223,6 +368,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java index 6caa30314595..010b0e2adcee 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeService.java @@ -682,6 +682,14 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response // Parameter: enum_form_string Optional enumFormString = testEnumParametersOp.enumFormString(request, formParams, validator); + + // Parameter: enum_form_integer + Optional enumFormInteger = testEnumParametersOp.enumFormInteger(request, formParams, validator); + + + // Parameter: enum_form_double + Optional enumFormDouble = testEnumParametersOp.enumFormDouble(request, formParams, validator); + validator.execute(); handleTestEnumParameters(request, response, @@ -693,7 +701,9 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response enumQueryDouble, enumQueryModelArray, enumFormStringArray, - enumFormString); + enumFormString, + enumFormInteger, + enumFormDouble); } /** @@ -710,6 +720,8 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response * @param enumQueryModelArray enumQueryModelArray * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) */ protected abstract void handleTestEnumParameters(ServerRequest request, ServerResponse response, List enumHeaderStringArray, @@ -720,7 +732,9 @@ protected abstract void handleTestEnumParameters(ServerRequest request, ServerRe Optional enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, - Optional enumFormString); + Optional enumFormString, + Optional enumFormInteger, + Optional enumFormDouble); /** * DELETE /fake : Fake endpoint to test group parameters (optional). @@ -2983,6 +2997,47 @@ protected Optional enumFormString(ServerRequest request, Parameters form "(xyz)"))); } + /** + * Prepares the enumFormInteger parameter. + * + * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter + * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation + * @return enumFormInteger parameter value + */ + protected Optional enumFormInteger(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) { + return formParams + .first("enum_form_integer") + .asOptional() + .or(() -> Optional.of("1")) + .map(Integer::valueOf) + .map(v -> validator.check("enum_form_integer", + v, + List.of(1, + -1, + 0))); + } + + /** + * Prepares the enumFormDouble parameter. + * + * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter + * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation + * @return enumFormDouble parameter value + */ + protected Optional enumFormDouble(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) { + return formParams + .first("enum_form_double") + .asOptional() + .or(() -> Optional.of("1.1")) + .map(BigDecimal::new) + .map(v -> validator.check("enum_form_double", + v, + List.of(new BigDecimal("1.1"), + new BigDecimal("-1.1"), + new BigDecimal("0.1"), + new BigDecimal("0.0")))); + } + /** * Response for HTTP status code {@code 400}. */ diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java index e47df278f682..6fc2ef7e47e9 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/api/FakeServiceImpl.java @@ -165,7 +165,9 @@ protected void handleTestEnumParameters(ServerRequest request, ServerResponse re Optional enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, - Optional enumFormString) { + Optional enumFormString, + Optional enumFormInteger, + Optional enumFormDouble) { response.status(Status.NOT_IMPLEMENTED_501).send(); } diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java index 0ca5e240f6f6..702165a01c9e 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/java/org/openapitools/server/model/Order.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) { private StatusEnum status; 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(String text) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + + @JsonCreator + public static OrderStatusEnum fromValue(String text) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private OrderStatusEnum orderStatus; + /** * Default constructor. */ @@ -71,6 +148,8 @@ public Order() { * @param shipDate shipDate * @param status Order Status * @param complete complete + * @param paymentMethod Various payment methods + * @param orderStatus Order status */ public Order( Long id, @@ -78,7 +157,9 @@ public Order( Integer quantity, OffsetDateTime shipDate, StatusEnum status, - Boolean complete + Boolean complete, + PaymentMethodEnum paymentMethod, + OrderStatusEnum orderStatus ) { this.id = id; this.petId = petId; @@ -86,6 +167,8 @@ public Order( this.shipDate = shipDate; this.status = status; this.complete = complete; + this.paymentMethod = paymentMethod; + this.orderStatus = orderStatus; } @@ -162,6 +245,30 @@ public void setComplete(Boolean complete) { this.complete = complete; } + /** + * Various payment methods + * @return paymentMethod + */ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + /** + * Order status + * @return orderStatus + */ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + /** * Create a string representation of this pojo. **/ @@ -176,6 +283,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java index a308fb480027..85fa383ac755 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeService.java @@ -678,6 +678,14 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response // Parameter: enum_form_string Optional enumFormString = testEnumParametersOp.enumFormString(request, formParams, validator); + + // Parameter: enum_form_integer + Optional enumFormInteger = testEnumParametersOp.enumFormInteger(request, formParams, validator); + + + // Parameter: enum_form_double + Optional enumFormDouble = testEnumParametersOp.enumFormDouble(request, formParams, validator); + validator.execute(); handleTestEnumParameters(request, response, @@ -689,7 +697,9 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response enumQueryDouble, enumQueryModelArray, enumFormStringArray, - enumFormString); + enumFormString, + enumFormInteger, + enumFormDouble); } /** @@ -706,6 +716,8 @@ protected void testEnumParameters(ServerRequest request, ServerResponse response * @param enumQueryModelArray enumQueryModelArray * @param enumFormStringArray Form parameter enum test (string array) * @param enumFormString Form parameter enum test (string) + * @param enumFormInteger Form parameter enum test (integer) + * @param enumFormDouble Form parameter enum test (double) */ protected abstract void handleTestEnumParameters(ServerRequest request, ServerResponse response, List enumHeaderStringArray, @@ -716,7 +728,9 @@ protected abstract void handleTestEnumParameters(ServerRequest request, ServerRe Optional enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, - Optional enumFormString); + Optional enumFormString, + Optional enumFormInteger, + Optional enumFormDouble); /** * DELETE /fake : Fake endpoint to test group parameters (optional). @@ -2931,6 +2945,47 @@ protected Optional enumFormString(ServerRequest request, Parameters form "(xyz)"))); } + /** + * Prepares the enumFormInteger parameter. + * + * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter + * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation + * @return enumFormInteger parameter value + */ + protected Optional enumFormInteger(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) { + return formParams + .first("enum_form_integer") + .asOptional() + .or(() -> Optional.of("1")) + .map(Integer::valueOf) + .map(v -> validator.check("enum_form_integer", + v, + List.of(1, + -1, + 0))); + } + + /** + * Prepares the enumFormDouble parameter. + * + * @param request {@link io.helidon.webserver.http.ServerRequest} containing the parameter + * @param validator {@link org.openapitools.server.api.ValidatorUtils.Validator} for validating all parameters to the operation + * @return enumFormDouble parameter value + */ + protected Optional enumFormDouble(ServerRequest request, Parameters formParams, ValidatorUtils.Validator validator) { + return formParams + .first("enum_form_double") + .asOptional() + .or(() -> Optional.of("1.1")) + .map(BigDecimal::new) + .map(v -> validator.check("enum_form_double", + v, + List.of(new BigDecimal("1.1"), + new BigDecimal("-1.1"), + new BigDecimal("0.1"), + new BigDecimal("0.0")))); + } + /** * Response for HTTP status code {@code 400}. */ diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java index 012b7789b1b5..dda18ca2010b 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/api/FakeServiceImpl.java @@ -163,7 +163,9 @@ protected void handleTestEnumParameters(ServerRequest request, ServerResponse re Optional enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, - Optional enumFormString) { + Optional enumFormString, + Optional enumFormInteger, + Optional enumFormDouble) { response.status(Status.NOT_IMPLEMENTED_501).send(); } diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java index 0ca5e240f6f6..702165a01c9e 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/java/org/openapitools/server/model/Order.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) { private StatusEnum status; 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(String text) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + + @JsonCreator + public static OrderStatusEnum fromValue(String text) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private OrderStatusEnum orderStatus; + /** * Default constructor. */ @@ -71,6 +148,8 @@ public Order() { * @param shipDate shipDate * @param status Order Status * @param complete complete + * @param paymentMethod Various payment methods + * @param orderStatus Order status */ public Order( Long id, @@ -78,7 +157,9 @@ public Order( Integer quantity, OffsetDateTime shipDate, StatusEnum status, - Boolean complete + Boolean complete, + PaymentMethodEnum paymentMethod, + OrderStatusEnum orderStatus ) { this.id = id; this.petId = petId; @@ -86,6 +167,8 @@ public Order( this.shipDate = shipDate; this.status = status; this.complete = complete; + this.paymentMethod = paymentMethod; + this.orderStatus = orderStatus; } @@ -162,6 +245,30 @@ public void setComplete(Boolean complete) { this.complete = complete; } + /** + * Various payment methods + * @return paymentMethod + */ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + /** + * Order status + * @return orderStatus + */ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + /** * Create a string representation of this pojo. **/ @@ -176,6 +283,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java index 0ca5e240f6f6..702165a01c9e 100644 --- a/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java +++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/java/org/openapitools/server/model/Order.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; import java.time.OffsetDateTime; import jakarta.validation.constraints.*; import jakarta.validation.Valid; @@ -55,6 +56,82 @@ public static StatusEnum fromValue(String text) { private StatusEnum status; 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(String text) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + + @JsonCreator + public static OrderStatusEnum fromValue(String text) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } + } + + + private OrderStatusEnum orderStatus; + /** * Default constructor. */ @@ -71,6 +148,8 @@ public Order() { * @param shipDate shipDate * @param status Order Status * @param complete complete + * @param paymentMethod Various payment methods + * @param orderStatus Order status */ public Order( Long id, @@ -78,7 +157,9 @@ public Order( Integer quantity, OffsetDateTime shipDate, StatusEnum status, - Boolean complete + Boolean complete, + PaymentMethodEnum paymentMethod, + OrderStatusEnum orderStatus ) { this.id = id; this.petId = petId; @@ -86,6 +167,8 @@ public Order( this.shipDate = shipDate; this.status = status; this.complete = complete; + this.paymentMethod = paymentMethod; + this.orderStatus = orderStatus; } @@ -162,6 +245,30 @@ public void setComplete(Boolean complete) { this.complete = complete; } + /** + * Various payment methods + * @return paymentMethod + */ + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + /** + * Order status + * @return orderStatus + */ + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + /** * Create a string representation of this pojo. **/ @@ -176,6 +283,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..8bde7b4f8db9 100644 --- a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml @@ -1436,8 +1436,10 @@ components: type: string Order: example: + OrderStatus: "{}" petId: 6 quantity: 1 + paymentMethod: 1 id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 complete: false @@ -1465,6 +1467,25 @@ 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 + OrderStatus: + additionalProperties: false + description: Order status + enum: + - PENDING + - PROCESSING + type: object type: object xml: name: Order @@ -2217,6 +2238,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/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java index aaeb77805c5c..cc466a14e39a 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java @@ -574,7 +574,7 @@ public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.N - public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString) { + public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble) { MappingBuilder stub = get(urlPathEqualTo("/fake")) .willReturn(aResponse() .withStatus(400) @@ -601,6 +601,12 @@ public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullabl if(enumFormString != null) { stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString)); } + if(enumFormInteger != null) { + stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger)); + } + if(enumFormDouble != null) { + stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble)); + } if(enumHeaderStringArray != null) { stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray)); } @@ -611,7 +617,7 @@ public static MappingBuilder stubTestEnumParameters400(@javax.annotation.Nullabl return stub; } - public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString) { + public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble) { MappingBuilder stub = get(urlPathEqualTo("/fake")) .willReturn(aResponse() .withStatus(404) @@ -638,6 +644,12 @@ public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullabl if(enumFormString != null) { stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString)); } + if(enumFormInteger != null) { + stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger)); + } + if(enumFormDouble != null) { + stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble)); + } if(enumHeaderStringArray != null) { stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray)); } @@ -648,7 +660,7 @@ public static MappingBuilder stubTestEnumParameters404(@javax.annotation.Nullabl return stub; } - public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, Fault fault) { + public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nullable String enumHeaderStringArray, @javax.annotation.Nullable String enumHeaderString, @javax.annotation.Nullable String enumQueryStringArray, @javax.annotation.Nullable String enumQueryString, @javax.annotation.Nullable String enumQueryInteger, @javax.annotation.Nullable String enumQueryDouble, @javax.annotation.Nullable String enumQueryModelArray, @javax.annotation.Nullable String enumFormStringArray, @javax.annotation.Nullable String enumFormString, @javax.annotation.Nullable String enumFormInteger, @javax.annotation.Nullable String enumFormDouble, Fault fault) { MappingBuilder stub = get(urlPathEqualTo("/fake")) .willReturn(aResponse() .withFault(fault) @@ -675,6 +687,12 @@ public static MappingBuilder stubTestEnumParametersFault(@javax.annotation.Nulla if(enumFormString != null) { stub = stub.withFormParam("enum_form_string", havingExactly(enumFormString)); } + if(enumFormInteger != null) { + stub = stub.withFormParam("enum_form_integer", havingExactly(enumFormInteger)); + } + if(enumFormDouble != null) { + stub = stub.withFormParam("enum_form_double", havingExactly(enumFormDouble)); + } if(enumHeaderStringArray != null) { stub = stub.withHeader("enum_header_string_array", havingExactly(enumHeaderStringArray)); } diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java index 636a8f13b705..b6e7356cad0c 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java @@ -131,10 +131,10 @@ public static MappingBuilder stubGetOrderByIdFault(@javax.annotation.Nonnull Str } public static String getOrderById200ResponseSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; } public static String getOrderById200ResponseSample2() { - return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; + return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true 1 UNDEFINED_EXAMPLE_VALUE "; } @@ -180,14 +180,14 @@ public static MappingBuilder stubPlaceOrderFault(@javax.annotation.Nonnull Strin } public static String placeOrder200ResponseSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; } public static String placeOrder200ResponseSample2() { - return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; + return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true 1 UNDEFINED_EXAMPLE_VALUE "; } public static String placeOrderRequestSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"OrderStatus\" : \"{}\", \"petId\" : 6, \"quantity\" : 1, \"paymentMethod\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index 2f0fb0689ede..a9a836cb940a 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -252,9 +252,9 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid request", response = Void.class), @io.swagger.annotations.ApiResponse(code = 404, message = "Not found", response = Void.class) }) - public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") List enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble,@ApiParam(value = "") @QueryParam("enum_query_model_array") List enumQueryModelArray,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@Context SecurityContext securityContext) + public Response testEnumParameters(@ApiParam(value = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@ApiParam(value = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@ApiParam(value = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") List enumQueryStringArray,@ApiParam(value = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger,@ApiParam(value = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble,@ApiParam(value = "") @QueryParam("enum_query_model_array") List enumQueryModelArray,@ApiParam(value = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray,@ApiParam(value = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@ApiParam(value = "Form parameter enum test (integer)", allowableValues="1, -1, 0", defaultValue="1") @DefaultValue("1") @FormParam("enum_form_integer") Integer enumFormInteger,@ApiParam(value = "Form parameter enum test (double)", allowableValues="1.1, -1.1, 0.1, 0.0", defaultValue="1.1") @DefaultValue("1.1") @FormParam("enum_form_double") BigDecimal enumFormDouble,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, securityContext); + return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, securityContext); } @javax.ws.rs.DELETE diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java index f5fd9fafe503..75ebb2e93b0f 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java @@ -46,7 +46,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException; public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumQueryModelArray,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumQueryModelArray,List enumFormStringArray,String enumFormString,Integer enumFormInteger,BigDecimal enumFormDouble,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map requestBody,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineFreeformAdditionalProperties(TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java index 9158dc99cb03..f242d590e53e 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import javax.validation.constraints.*; @@ -33,7 +34,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -98,6 +101,84 @@ public static StatusEnum fromValue(String value) { @JsonProperty(JSON_PROPERTY_COMPLETE) 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"; + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + private OrderStatusEnum orderStatus; + public Order id(Long id) { this.id = id; return this; @@ -218,6 +299,46 @@ public void setComplete(Boolean complete) { this.complete = complete; } + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + **/ + @JsonProperty(value = "paymentMethod") + @ApiModelProperty(example = "1", value = "Various payment methods") + + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + **/ + @JsonProperty(value = "OrderStatus") + @ApiModelProperty(value = "Order status") + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -233,12 +354,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -252,6 +375,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index a0f895862eff..5583e49996a8 100644 --- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -102,7 +102,7 @@ public Response testEndpointParameters(BigDecimal number, Double _double, String return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, SecurityContext securityContext) throws NotFoundException { + public Response testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java index e60820ee5f9e..d51c58902215 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java @@ -313,7 +313,7 @@ public Response testEndpointParameters(@FormParam(value = "number") BigDecimal }) }) - public Response testEnumParameters(@HeaderParam("enum_header_string_array") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Header parameter enum test (string array)") List enumHeaderStringArray,@QueryParam("enum_query_string_array") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString) { + public Response testEnumParameters(@HeaderParam("enum_header_string_array") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Header parameter enum test (string array)") List enumHeaderStringArray,@QueryParam("enum_query_string_array") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string array)") List enumQueryStringArray,@QueryParam("enum_query_string") @DefaultValue("-efg") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (string)") String enumQueryString,@QueryParam("enum_query_integer") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)") Integer enumQueryInteger,@QueryParam("enum_query_double") @org.eclipse.microprofile.openapi.annotations.parameters.Parameter(description="Query parameter enum test (double)") Double enumQueryDouble,@QueryParam("enum_query_model_array") List enumQueryModelArray,@FormParam(value = "enum_form_string_array") List enumFormStringArray,@FormParam(value = "enum_form_string") String enumFormString,@FormParam(value = "enum_form_integer") Integer enumFormInteger,@FormParam(value = "enum_form_double") BigDecimal enumFormDouble) { return Response.ok().entity("magic!").build(); } diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java index 828d7d85ae83..c115d4186f01 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Order.java @@ -1,5 +1,6 @@ package org.openapitools.model; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.io.Serializable; import javax.validation.constraints.*; @@ -70,6 +71,102 @@ public static StatusEnum fromValue(String value) { private StatusEnum status; private Boolean complete = false; + public enum PaymentMethodEnum { + + NUMBER_1(BigDecimal.valueOf(new BigDecimal("1"))), NUMBER_2(BigDecimal.valueOf(new BigDecimal("2"))); + + + private BigDecimal value; + + PaymentMethodEnum (BigDecimal v) { + value = v; + } + + public BigDecimal value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into BigDecimal, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static PaymentMethodEnum fromString(String s) { + for (PaymentMethodEnum b : PaymentMethodEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @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 + "'"); + } +} + + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + public enum OrderStatusEnum { + + PENDING(Object.valueOf("PENDING")), PROCESSING(Object.valueOf("PROCESSING")); + + + private Object value; + + OrderStatusEnum (Object v) { + value = v; + } + + public Object value() { + return value; + } + + @Override + @JsonValue + public String toString() { + return String.valueOf(value); + } + + /** + * Convert a String into Object, as specified in the + * See JAX RS 2.0 Specification, section 3.2, p. 12 + */ + public static OrderStatusEnum fromString(String s) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + // using Objects.toString() to be safe if value type non-object type + // because types like 'int' etc. will be auto-boxed + if (java.util.Objects.toString(b.value).equals(s)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected string value '" + s + "'"); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + private OrderStatusEnum orderStatus; protected Order(OrderBuilder b) { this.id = b.id; @@ -78,6 +175,8 @@ protected Order(OrderBuilder b) { this.shipDate = b.shipDate; this.status = b.status; this.complete = b.complete; + this.paymentMethod = b.paymentMethod; + this.orderStatus = b.orderStatus; } public Order() { @@ -198,6 +297,46 @@ public void setComplete(Boolean complete) { this.complete = complete; } + /** + * Various payment methods + **/ + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + + + @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "1", description = "Various payment methods") + @JsonProperty("paymentMethod") + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + @JsonProperty("paymentMethod") + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + /** + * Order status + **/ + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + + + @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "Order status") + @JsonProperty("OrderStatus") + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + @JsonProperty("OrderStatus") + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -213,12 +352,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -232,6 +373,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } @@ -272,6 +415,8 @@ public static abstract class OrderBuilder enumHeaderStringArray,@Schema(description = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@Schema(description = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") List enumQueryStringArray,@Schema(description = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,@Schema(description = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger,@Schema(description = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble,@Schema(description = "") @QueryParam("enum_query_model_array") List enumQueryModelArray,@Schema(description = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray,@Schema(description = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@Context SecurityContext securityContext) + public Response testEnumParameters(@Schema(description = "Header parameter enum test (string array)" , allowableValues=">, $")@HeaderParam("enum_header_string_array") List enumHeaderStringArray,@Schema(description = "Header parameter enum test (string)" , allowableValues="_abc, -efg, (xyz)", defaultValue="-efg")@HeaderParam("enum_header_string") String enumHeaderString,@Schema(description = "Query parameter enum test (string array)") @QueryParam("enum_query_string_array") List enumQueryStringArray,@Schema(description = "Query parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue = "-efg") @DefaultValue("-efg") @QueryParam("enum_query_string") String enumQueryString,@Schema(description = "Query parameter enum test (double)", allowableValues="1, -2") @QueryParam("enum_query_integer") Integer enumQueryInteger,@Schema(description = "Query parameter enum test (double)", allowableValues="1.1, -1.2") @QueryParam("enum_query_double") Double enumQueryDouble,@Schema(description = "") @QueryParam("enum_query_model_array") List enumQueryModelArray,@Schema(description = "Form parameter enum test (string array)", allowableValues=">, $", defaultValue="$") @DefaultValue("$") @FormParam("enum_form_string_array") List enumFormStringArray,@Schema(description = "Form parameter enum test (string)", allowableValues="_abc, -efg, (xyz)", defaultValue="-efg") @DefaultValue("-efg") @FormParam("enum_form_string") String enumFormString,@Schema(description = "Form parameter enum test (integer)", allowableValues="1, -1, 0", defaultValue="1") @DefaultValue("1") @FormParam("enum_form_integer") Integer enumFormInteger,@Schema(description = "Form parameter enum test (double)", allowableValues="1.1, -1.1, 0.1, 0.0", defaultValue="1.1") @DefaultValue("1.1") @FormParam("enum_form_double") BigDecimal enumFormDouble,@Context SecurityContext securityContext) throws NotFoundException { - return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, securityContext); + return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, securityContext); } @jakarta.ws.rs.DELETE diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java index 7db11dbb11bf..7137feff92db 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java @@ -46,7 +46,7 @@ public abstract class FakeApiService { public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException; public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException; public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException; - public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumQueryModelArray,List enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException; + public abstract Response testEnumParameters(List enumHeaderStringArray,String enumHeaderString,List enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List enumQueryModelArray,List enumFormStringArray,String enumFormString,Integer enumFormInteger,BigDecimal enumFormDouble,SecurityContext securityContext) throws NotFoundException; public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineAdditionalProperties(Map requestBody,SecurityContext securityContext) throws NotFoundException; public abstract Response testInlineFreeformAdditionalProperties(TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest,SecurityContext securityContext) throws NotFoundException; diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java index fcda5e48112c..02dc0956832c 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/Order.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.v3.oas.annotations.media.Schema; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import jakarta.validation.constraints.*; @@ -32,7 +33,9 @@ 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, + Order.JSON_PROPERTY_ORDER_STATUS }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT") public class Order { @@ -97,6 +100,84 @@ public static StatusEnum fromValue(String value) { @JsonProperty(JSON_PROPERTY_COMPLETE) 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"; + @JsonProperty(JSON_PROPERTY_PAYMENT_METHOD) + private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1; + + /** + * Order status + */ + public enum OrderStatusEnum { + PENDING("PENDING"), + + PROCESSING("PROCESSING"); + + private Object value; + + OrderStatusEnum(Object value) { + this.value = value; + } + + @JsonValue + public Object getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OrderStatusEnum fromValue(Object value) { + for (OrderStatusEnum b : OrderStatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ORDER_STATUS = "OrderStatus"; + @JsonProperty(JSON_PROPERTY_ORDER_STATUS) + private OrderStatusEnum orderStatus; + public Order id(Long id) { this.id = id; return this; @@ -217,6 +298,46 @@ public void setComplete(Boolean complete) { this.complete = complete; } + public Order paymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + return this; + } + + /** + * Various payment methods + * @return paymentMethod + **/ + @JsonProperty(value = "paymentMethod") + @Schema(example = "1", description = "Various payment methods") + + public PaymentMethodEnum getPaymentMethod() { + return paymentMethod; + } + + public void setPaymentMethod(PaymentMethodEnum paymentMethod) { + this.paymentMethod = paymentMethod; + } + + public Order orderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + return this; + } + + /** + * Order status + * @return orderStatus + **/ + @JsonProperty(value = "OrderStatus") + @Schema(description = "Order status") + + public OrderStatusEnum getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(OrderStatusEnum orderStatus) { + this.orderStatus = orderStatus; + } + @Override public boolean equals(Object o) { @@ -232,12 +353,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.orderStatus, order.orderStatus); } @Override public int hashCode() { - return Objects.hash(id, petId, quantity, shipDate, status, complete); + return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, orderStatus); } @Override @@ -251,6 +374,8 @@ 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(" orderStatus: ").append(toIndentedString(orderStatus)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java index cfc74fa7f13c..5169c8c6465a 100644 --- a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java +++ b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java @@ -102,7 +102,7 @@ public Response testEndpointParameters(BigDecimal number, Double _double, String return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } @Override - public Response testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, SecurityContext securityContext) throws NotFoundException { + public Response testEnumParameters(List enumHeaderStringArray, String enumHeaderString, List enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List enumQueryModelArray, List enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, SecurityContext securityContext) throws NotFoundException { // do some magic! return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build(); } diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES index 0766ce49b8a4..06d86baa9fb5 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/FILES +++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES @@ -60,6 +60,8 @@ Model/NullableClass.php Model/NumberOnly.php Model/ObjectWithDeprecatedFields.php Model/Order.php +Model/OrderOrderStatus.php +Model/OrderPaymentMethod.php Model/OrderStatus.php Model/OuterComposite.php Model/OuterEnum.php @@ -78,6 +80,8 @@ Model/Tag.php Model/TestEnumParametersEnumHeaderStringParameter.php Model/TestEnumParametersEnumQueryDoubleParameter.php Model/TestEnumParametersEnumQueryIntegerParameter.php +Model/TestEnumParametersRequestEnumFormDouble.php +Model/TestEnumParametersRequestEnumFormInteger.php Model/TestEnumParametersRequestEnumFormString.php Model/TestEnumParametersRequestEnumFormStringArrayInner.php Model/TestInlineFreeformAdditionalPropertiesRequest.php diff --git a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php index 0ba584fe917a..497f170758ef 100644 --- a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php +++ b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php @@ -244,6 +244,8 @@ public function testEndpointParameters( * @param null | \OpenAPI\Server\Model\EnumClass[] $enumQueryModelArray * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumFormStringArray * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumFormString + * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger $enumFormInteger + * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble $enumFormDouble * @return \OpenAPI\Server\Model\NoContent400 | \OpenAPI\Server\Model\NoContent404 */ public function testEnumParameters( @@ -256,6 +258,8 @@ public function testEnumParameters( ?array $enumQueryModelArray, ?array $enumFormStringArray, ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumFormString, + ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger $enumFormInteger, + ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble $enumFormDouble, ): \OpenAPI\Server\Model\NoContent400 | \OpenAPI\Server\Model\NoContent404 diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php index ae433d8b5ec6..330949429f5e 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php @@ -669,6 +669,10 @@ public function testEnumParameters(Request $request): JsonResponse ], 'enumFormString' => [ ], + 'enumFormInteger' => [ + ], + 'enumFormDouble' => [ + ], ], ); @@ -694,8 +698,12 @@ public function testEnumParameters(Request $request): JsonResponse $enumFormString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class); + $enumFormInteger = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormInteger::class); + + $enumFormDouble = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormDouble::class); + - $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString); + $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString, $enumFormInteger, $enumFormDouble); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); diff --git a/samples/server/petstore/php-laravel/Model/Order.php b/samples/server/petstore/php-laravel/Model/Order.php index 4a9f2eb3d572..21509e99d91c 100644 --- a/samples/server/petstore/php-laravel/Model/Order.php +++ b/samples/server/petstore/php-laravel/Model/Order.php @@ -51,6 +51,12 @@ class Order * * * @param bool $complete + * + * + * @param \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod + * + * + * @param \OpenAPI\Server\Model\OrderOrderStatus $orderStatus */ public function __construct( @@ -60,6 +66,8 @@ public function __construct( public \DateTime $shipDate, public \OpenAPI\Server\Model\OrderStatus $status, public bool $complete = false, + public \OpenAPI\Server\Model\OrderPaymentMethod $paymentMethod, + public \OpenAPI\Server\Model\OrderOrderStatus $orderStatus, ) {} } diff --git a/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php b/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php new file mode 100644 index 000000000000..efc3a7cccecd --- /dev/null +++ b/samples/server/petstore/php-laravel/Model/OrderOrderStatus.php @@ -0,0 +1,42 @@ + https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/ + */ + + +/** + * OrderOrderStatus + */ +namespace OpenAPI\Server\Model; + +/** + * OrderOrderStatus + * @description Order status + */ +use Crell\Serde\Renaming\Cases; +use Crell\Serde\Attributes as Serde; + +#[Serde\ClassSettings(renameWith: Cases::snake_case)] +class OrderOrderStatus +{ + /** + */ + + public function __construct( + ) {} +} + diff --git a/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php b/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php new file mode 100644 index 000000000000..3e168094a551 --- /dev/null +++ b/samples/server/petstore/php-laravel/Model/OrderPaymentMethod.php @@ -0,0 +1,34 @@ + https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/ + */ + + +/** + * OrderPaymentMethod + */ +namespace OpenAPI\Server\Model; + +/** + * OrderPaymentMethod + * @description Various payment methods + */ +enum OrderPaymentMethod: float +{ + case NUMBER_1 = 1; + case NUMBER_2 = 2; +} diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php new file mode 100644 index 000000000000..47d6def4d43c --- /dev/null +++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormDouble.php @@ -0,0 +1,36 @@ + https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/ + */ + + +/** + * TestEnumParametersRequestEnumFormDouble + */ +namespace OpenAPI\Server\Model; + +/** + * TestEnumParametersRequestEnumFormDouble + * @description Form parameter enum test (double) + */ +enum TestEnumParametersRequestEnumFormDouble: float +{ + case NUMBER_1_DOT_1 = 1.1; + case MINUS_1_DOT_1 = -1.1; + case NUMBER_0_DOT_1 = 0.1; + case NUMBER_0_DOT_0 = 0.0; +} diff --git a/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php new file mode 100644 index 000000000000..4cbc21ceca31 --- /dev/null +++ b/samples/server/petstore/php-laravel/Model/TestEnumParametersRequestEnumFormInteger.php @@ -0,0 +1,35 @@ + https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/php-laravel/ + */ + + +/** + * TestEnumParametersRequestEnumFormInteger + */ +namespace OpenAPI\Server\Model; + +/** + * TestEnumParametersRequestEnumFormInteger + * @description Form parameter enum test (integer) + */ +enum TestEnumParametersRequestEnumFormInteger: int +{ + case NUMBER_1 = 1; + case MINUS_1 = -1; + case NUMBER_0 = 0; +} diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php index 984dd7ac20b9..e77adf94ff79 100644 --- a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php +++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php @@ -183,6 +183,10 @@ public function testEnumParameters() $enum_form_string = $input['enum_form_string']; + $enum_form_integer = $input['enum_form_integer']; + + $enum_form_double = $input['enum_form_double']; + return response('How about implementing testEnumParameters as a get method ?'); }