From aa339d6046ad9c7b68a0afc4584d0b23cb7116db Mon Sep 17 00:00:00 2001 From: Dec12 | Fujigon Date: Wed, 27 Feb 2019 12:14:21 +0900 Subject: [PATCH] [core] add test cases for referenced enum case (#2237) * add test case * regenerate samples --- ...ith-fake-endpoints-models-for-testing.yaml | 26 +++++ .../petstore/php/OpenAPIClient-php/README.md | 3 + .../OpenAPIClient-php/docs/Model/EnumTest.md | 3 + .../docs/Model/OuterEnumDefaultValue.md | 9 ++ .../docs/Model/OuterEnumInteger.md | 9 ++ .../Model/OuterEnumIntegerDefaultValue.md | 9 ++ .../OpenAPIClient-php/lib/Model/EnumTest.php | 100 +++++++++++++++++- .../lib/Model/OuterEnumDefaultValue.php | 64 +++++++++++ .../lib/Model/OuterEnumInteger.php | 64 +++++++++++ .../Model/OuterEnumIntegerDefaultValue.php | 64 +++++++++++ .../test/Model/EnumTestTest.php | 21 ++++ .../test/Model/OuterEnumDefaultValueTest.php | 80 ++++++++++++++ .../OuterEnumIntegerDefaultValueTest.php | 80 ++++++++++++++ .../test/Model/OuterEnumIntegerTest.php | 80 ++++++++++++++ .../openapi3/client/petstore/python/README.md | 3 + .../client/petstore/python/docs/EnumTest.md | 3 + .../python/docs/OuterEnumDefaultValue.md | 9 ++ .../petstore/python/docs/OuterEnumInteger.md | 9 ++ .../docs/OuterEnumIntegerDefaultValue.md | 9 ++ .../petstore/python/petstore_api/__init__.py | 3 + .../python/petstore_api/models/__init__.py | 3 + .../python/petstore_api/models/enum_test.py | 84 ++++++++++++++- .../models/outer_enum_default_value.py | 91 ++++++++++++++++ .../petstore_api/models/outer_enum_integer.py | 91 ++++++++++++++++ .../outer_enum_integer_default_value.py | 91 ++++++++++++++++ .../test/test_outer_enum_default_value.py | 39 +++++++ .../python/test/test_outer_enum_integer.py | 39 +++++++ .../test_outer_enum_integer_default_value.py | 39 +++++++ .../openapi3/client/petstore/ruby/README.md | 3 + .../client/petstore/ruby/docs/EnumTest.md | 3 + .../ruby/docs/OuterEnumDefaultValue.md | 7 ++ .../petstore/ruby/docs/OuterEnumInteger.md | 7 ++ .../ruby/docs/OuterEnumIntegerDefaultValue.md | 7 ++ .../client/petstore/ruby/lib/petstore.rb | 3 + .../ruby/lib/petstore/models/enum_test.rb | 35 +++++- .../models/outer_enum_default_value.rb | 37 +++++++ .../lib/petstore/models/outer_enum_integer.rb | 37 +++++++ .../outer_enum_integer_default_value.rb | 37 +++++++ .../models/outer_enum_default_value_spec.rb | 35 ++++++ .../outer_enum_integer_default_value_spec.rb | 35 ++++++ .../spec/models/outer_enum_integer_spec.rb | 35 ++++++ .../java/org/openapitools/model/EnumTest.java | 82 +++++++++++++- .../model/OuterEnumDefaultValue.java | 61 +++++++++++ .../openapitools/model/OuterEnumInteger.java | 61 +++++++++++ .../model/OuterEnumIntegerDefaultValue.java | 61 +++++++++++ 45 files changed, 1657 insertions(+), 14 deletions(-) create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php create mode 100644 samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php create mode 100644 samples/openapi3/client/petstore/python/docs/OuterEnumDefaultValue.md create mode 100644 samples/openapi3/client/petstore/python/docs/OuterEnumInteger.md create mode 100644 samples/openapi3/client/petstore/python/docs/OuterEnumIntegerDefaultValue.md create mode 100644 samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_default_value.py create mode 100644 samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer.py create mode 100644 samples/openapi3/client/petstore/python/petstore_api/models/outer_enum_integer_default_value.py create mode 100644 samples/openapi3/client/petstore/python/test/test_outer_enum_default_value.py create mode 100644 samples/openapi3/client/petstore/python/test/test_outer_enum_integer.py create mode 100644 samples/openapi3/client/petstore/python/test/test_outer_enum_integer_default_value.py create mode 100644 samples/openapi3/client/petstore/ruby/docs/OuterEnumDefaultValue.md create mode 100644 samples/openapi3/client/petstore/ruby/docs/OuterEnumInteger.md create mode 100644 samples/openapi3/client/petstore/ruby/docs/OuterEnumIntegerDefaultValue.md create mode 100644 samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb create mode 100644 samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb create mode 100644 samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb create mode 100644 samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb create mode 100644 samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb create mode 100644 samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java create mode 100644 samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java 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 4890407bacb..35335d5cdc3 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 @@ -1425,6 +1425,12 @@ components: - -1.2 outerEnum: $ref: '#/components/schemas/OuterEnum' + outerEnumInteger: + $ref: '#/components/schemas/OuterEnumInteger' + outerEnumDefaultValue: + $ref: '#/components/schemas/OuterEnumDefaultValue' + outerEnumIntegerDefaultValue: + $ref: '#/components/schemas/OuterEnumIntegerDefaultValue' AdditionalPropertiesClass: type: object properties: @@ -1579,6 +1585,26 @@ components: - placed - approved - delivered + OuterEnumInteger: + type: integer + enum: + - 0 + - 1 + - 2 + OuterEnumDefaultValue: + type: string + enum: + - placed + - approved + - delivered + default: placed + OuterEnumIntegerDefaultValue: + type: integer + enum: + - 0 + - 1 + - 2 + default: 0 OuterComposite: type: object properties: diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md index 7819f9ea689..729520b7ba5 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/README.md @@ -160,6 +160,9 @@ Class | Method | HTTP request | Description - [Order](docs/Model/Order.md) - [OuterComposite](docs/Model/OuterComposite.md) - [OuterEnum](docs/Model/OuterEnum.md) + - [OuterEnumDefaultValue](docs/Model/OuterEnumDefaultValue.md) + - [OuterEnumInteger](docs/Model/OuterEnumInteger.md) + - [OuterEnumIntegerDefaultValue](docs/Model/OuterEnumIntegerDefaultValue.md) - [Pet](docs/Model/Pet.md) - [ReadOnlyFirst](docs/Model/ReadOnlyFirst.md) - [SpecialModelName](docs/Model/SpecialModelName.md) diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md index 9aca24e644e..ccb11a3ce92 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/EnumTest.md @@ -8,6 +8,9 @@ Name | Type | Description | Notes **enum_integer** | **int** | | [optional] **enum_number** | **double** | | [optional] **outer_enum** | [**\OpenAPI\Client\Model\OuterEnum**](OuterEnum.md) | | [optional] +**outer_enum_integer** | [**\OpenAPI\Client\Model\OuterEnumInteger**](OuterEnumInteger.md) | | [optional] +**outer_enum_default_value** | [**\OpenAPI\Client\Model\OuterEnumDefaultValue**](OuterEnumDefaultValue.md) | | [optional] +**outer_enum_integer_default_value** | [**\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md new file mode 100644 index 00000000000..1487a710393 --- /dev/null +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumDefaultValue.md @@ -0,0 +1,9 @@ +# OuterEnumDefaultValue + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md new file mode 100644 index 00000000000..8be15eee6a2 --- /dev/null +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumInteger.md @@ -0,0 +1,9 @@ +# OuterEnumInteger + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md new file mode 100644 index 00000000000..27d962f106e --- /dev/null +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/docs/Model/OuterEnumIntegerDefaultValue.md @@ -0,0 +1,9 @@ +# OuterEnumIntegerDefaultValue + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index a78957b448e..ca48d715f48 100644 --- a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -61,7 +61,10 @@ class EnumTest implements ModelInterface, ArrayAccess 'enum_string_required' => 'string', 'enum_integer' => 'int', 'enum_number' => 'double', - 'outer_enum' => '\OpenAPI\Client\Model\OuterEnum' + 'outer_enum' => '\OpenAPI\Client\Model\OuterEnum', + 'outer_enum_integer' => '\OpenAPI\Client\Model\OuterEnumInteger', + 'outer_enum_default_value' => '\OpenAPI\Client\Model\OuterEnumDefaultValue', + 'outer_enum_integer_default_value' => '\OpenAPI\Client\Model\OuterEnumIntegerDefaultValue' ]; /** @@ -74,7 +77,10 @@ class EnumTest implements ModelInterface, ArrayAccess 'enum_string_required' => null, 'enum_integer' => 'int32', 'enum_number' => 'double', - 'outer_enum' => null + 'outer_enum' => null, + 'outer_enum_integer' => null, + 'outer_enum_default_value' => null, + 'outer_enum_integer_default_value' => null ]; /** @@ -108,7 +114,10 @@ class EnumTest implements ModelInterface, ArrayAccess 'enum_string_required' => 'enum_string_required', 'enum_integer' => 'enum_integer', 'enum_number' => 'enum_number', - 'outer_enum' => 'outerEnum' + 'outer_enum' => 'outerEnum', + 'outer_enum_integer' => 'outerEnumInteger', + 'outer_enum_default_value' => 'outerEnumDefaultValue', + 'outer_enum_integer_default_value' => 'outerEnumIntegerDefaultValue' ]; /** @@ -121,7 +130,10 @@ class EnumTest implements ModelInterface, ArrayAccess 'enum_string_required' => 'setEnumStringRequired', 'enum_integer' => 'setEnumInteger', 'enum_number' => 'setEnumNumber', - 'outer_enum' => 'setOuterEnum' + 'outer_enum' => 'setOuterEnum', + 'outer_enum_integer' => 'setOuterEnumInteger', + 'outer_enum_default_value' => 'setOuterEnumDefaultValue', + 'outer_enum_integer_default_value' => 'setOuterEnumIntegerDefaultValue' ]; /** @@ -134,7 +146,10 @@ class EnumTest implements ModelInterface, ArrayAccess 'enum_string_required' => 'getEnumStringRequired', 'enum_integer' => 'getEnumInteger', 'enum_number' => 'getEnumNumber', - 'outer_enum' => 'getOuterEnum' + 'outer_enum' => 'getOuterEnum', + 'outer_enum_integer' => 'getOuterEnumInteger', + 'outer_enum_default_value' => 'getOuterEnumDefaultValue', + 'outer_enum_integer_default_value' => 'getOuterEnumIntegerDefaultValue' ]; /** @@ -266,6 +281,9 @@ class EnumTest implements ModelInterface, ArrayAccess $this->container['enum_integer'] = isset($data['enum_integer']) ? $data['enum_integer'] : null; $this->container['enum_number'] = isset($data['enum_number']) ? $data['enum_number'] : null; $this->container['outer_enum'] = isset($data['outer_enum']) ? $data['outer_enum'] : null; + $this->container['outer_enum_integer'] = isset($data['outer_enum_integer']) ? $data['outer_enum_integer'] : null; + $this->container['outer_enum_default_value'] = isset($data['outer_enum_default_value']) ? $data['outer_enum_default_value'] : null; + $this->container['outer_enum_integer_default_value'] = isset($data['outer_enum_integer_default_value']) ? $data['outer_enum_integer_default_value'] : null; } /** @@ -482,6 +500,78 @@ class EnumTest implements ModelInterface, ArrayAccess return $this; } + + /** + * Gets outer_enum_integer + * + * @return \OpenAPI\Client\Model\OuterEnumInteger|null + */ + public function getOuterEnumInteger() + { + return $this->container['outer_enum_integer']; + } + + /** + * Sets outer_enum_integer + * + * @param \OpenAPI\Client\Model\OuterEnumInteger|null $outer_enum_integer outer_enum_integer + * + * @return $this + */ + public function setOuterEnumInteger($outer_enum_integer) + { + $this->container['outer_enum_integer'] = $outer_enum_integer; + + return $this; + } + + /** + * Gets outer_enum_default_value + * + * @return \OpenAPI\Client\Model\OuterEnumDefaultValue|null + */ + public function getOuterEnumDefaultValue() + { + return $this->container['outer_enum_default_value']; + } + + /** + * Sets outer_enum_default_value + * + * @param \OpenAPI\Client\Model\OuterEnumDefaultValue|null $outer_enum_default_value outer_enum_default_value + * + * @return $this + */ + public function setOuterEnumDefaultValue($outer_enum_default_value) + { + $this->container['outer_enum_default_value'] = $outer_enum_default_value; + + return $this; + } + + /** + * Gets outer_enum_integer_default_value + * + * @return \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null + */ + public function getOuterEnumIntegerDefaultValue() + { + return $this->container['outer_enum_integer_default_value']; + } + + /** + * Sets outer_enum_integer_default_value + * + * @param \OpenAPI\Client\Model\OuterEnumIntegerDefaultValue|null $outer_enum_integer_default_value outer_enum_integer_default_value + * + * @return $this + */ + public function setOuterEnumIntegerDefaultValue($outer_enum_integer_default_value) + { + $this->container['outer_enum_integer_default_value'] = $outer_enum_integer_default_value; + + return $this; + } /** * Returns true if offset exists. False otherwise. * diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php new file mode 100644 index 00000000000..d5878404aff --- /dev/null +++ b/samples/openapi3/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -0,0 +1,64 @@ + :'enum_string_required', :'enum_integer' => :'enum_integer', :'enum_number' => :'enum_number', - :'outer_enum' => :'outerEnum' + :'outer_enum' => :'outerEnum', + :'outer_enum_integer' => :'outerEnumInteger', + :'outer_enum_default_value' => :'outerEnumDefaultValue', + :'outer_enum_integer_default_value' => :'outerEnumIntegerDefaultValue' } end @@ -64,7 +73,10 @@ module Petstore :'enum_string_required' => :'String', :'enum_integer' => :'Integer', :'enum_number' => :'Float', - :'outer_enum' => :'OuterEnum' + :'outer_enum' => :'OuterEnum', + :'outer_enum_integer' => :'OuterEnumInteger', + :'outer_enum_default_value' => :'OuterEnumDefaultValue', + :'outer_enum_integer_default_value' => :'OuterEnumIntegerDefaultValue' } end @@ -102,6 +114,18 @@ module Petstore if attributes.key?(:'outer_enum') self.outer_enum = attributes[:'outer_enum'] end + + if attributes.has_key?(:'outerEnumInteger') + self.outer_enum_integer = attributes[:'outerEnumInteger'] + end + + if attributes.has_key?(:'outerEnumDefaultValue') + self.outer_enum_default_value = attributes[:'outerEnumDefaultValue'] + end + + if attributes.has_key?(:'outerEnumIntegerDefaultValue') + self.outer_enum_integer_default_value = attributes[:'outerEnumIntegerDefaultValue'] + end end # Show invalid properties with the reasons. Usually used together with valid? @@ -179,7 +203,10 @@ module Petstore enum_string_required == o.enum_string_required && enum_integer == o.enum_integer && enum_number == o.enum_number && - outer_enum == o.outer_enum + outer_enum == o.outer_enum && + outer_enum_integer == o.outer_enum_integer && + outer_enum_default_value == o.outer_enum_default_value && + outer_enum_integer_default_value == o.outer_enum_integer_default_value end # @see the `==` method @@ -191,7 +218,7 @@ module Petstore # Calculates hash code according to all attributes. # @return [Fixnum] Hash code def hash - [enum_string, enum_string_required, enum_integer, enum_number, outer_enum].hash + [enum_string, enum_string_required, enum_integer, enum_number, outer_enum, outer_enum_integer, outer_enum_default_value, outer_enum_integer_default_value].hash end # Builds the object from hash diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb new file mode 100644 index 00000000000..9696af239c5 --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -0,0 +1,37 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'date' + +module Petstore + class OuterEnumDefaultValue + PLACED = "placed".freeze + APPROVED = "approved".freeze + DELIVERED = "delivered".freeze + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def self.build_from_hash(value) + new.build_from_hash(value) + end + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def build_from_hash(value) + constantValues = OuterEnumDefaultValue.constants.select { |c| OuterEnumDefaultValue::const_get(c) == value } + raise "Invalid ENUM value #{value} for class #OuterEnumDefaultValue" if constantValues.empty? + value + end + end +end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb new file mode 100644 index 00000000000..ac807fb3a0e --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -0,0 +1,37 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'date' + +module Petstore + class OuterEnumInteger + N0 = 0.freeze + N1 = 1.freeze + N2 = 2.freeze + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def self.build_from_hash(value) + new.build_from_hash(value) + end + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def build_from_hash(value) + constantValues = OuterEnumInteger.constants.select { |c| OuterEnumInteger::const_get(c) == value } + raise "Invalid ENUM value #{value} for class #OuterEnumInteger" if constantValues.empty? + value + end + end +end diff --git a/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb new file mode 100644 index 00000000000..4563c0771c0 --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -0,0 +1,37 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'date' + +module Petstore + class OuterEnumIntegerDefaultValue + N0 = 0.freeze + N1 = 1.freeze + N2 = 2.freeze + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def self.build_from_hash(value) + new.build_from_hash(value) + end + + # Builds the enum from string + # @param [String] The enum value in the form of the string + # @return [String] The enum value + def build_from_hash(value) + constantValues = OuterEnumIntegerDefaultValue.constants.select { |c| OuterEnumIntegerDefaultValue::const_get(c) == value } + raise "Invalid ENUM value #{value} for class #OuterEnumIntegerDefaultValue" if constantValues.empty? + value + end + end +end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb new file mode 100644 index 00000000000..23ca5fd0b5f --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_default_value_spec.rb @@ -0,0 +1,35 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'spec_helper' +require 'json' +require 'date' + +# Unit tests for Petstore::OuterEnumDefaultValue +# Automatically generated by openapi-generator (https://openapi-generator.tech) +# Please update as you see appropriate +describe 'OuterEnumDefaultValue' do + before do + # run before each test + @instance = Petstore::OuterEnumDefaultValue.new + end + + after do + # run after each test + end + + describe 'test an instance of OuterEnumDefaultValue' do + it 'should create an instance of OuterEnumDefaultValue' do + expect(@instance).to be_instance_of(Petstore::OuterEnumDefaultValue) + end + end +end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb new file mode 100644 index 00000000000..433d7fbf275 --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_default_value_spec.rb @@ -0,0 +1,35 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'spec_helper' +require 'json' +require 'date' + +# Unit tests for Petstore::OuterEnumIntegerDefaultValue +# Automatically generated by openapi-generator (https://openapi-generator.tech) +# Please update as you see appropriate +describe 'OuterEnumIntegerDefaultValue' do + before do + # run before each test + @instance = Petstore::OuterEnumIntegerDefaultValue.new + end + + after do + # run after each test + end + + describe 'test an instance of OuterEnumIntegerDefaultValue' do + it 'should create an instance of OuterEnumIntegerDefaultValue' do + expect(@instance).to be_instance_of(Petstore::OuterEnumIntegerDefaultValue) + end + end +end diff --git a/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb new file mode 100644 index 00000000000..e4b7a99346a --- /dev/null +++ b/samples/openapi3/client/petstore/ruby/spec/models/outer_enum_integer_spec.rb @@ -0,0 +1,35 @@ +=begin +#OpenAPI Petstore + +#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + +OpenAPI spec version: 1.0.0 + +Generated by: https://openapi-generator.tech +OpenAPI Generator version: 4.0.0-SNAPSHOT + +=end + +require 'spec_helper' +require 'json' +require 'date' + +# Unit tests for Petstore::OuterEnumInteger +# Automatically generated by openapi-generator (https://openapi-generator.tech) +# Please update as you see appropriate +describe 'OuterEnumInteger' do + before do + # run before each test + @instance = Petstore::OuterEnumInteger.new + end + + after do + # run after each test + end + + describe 'test an instance of OuterEnumInteger' do + it 'should create an instance of OuterEnumInteger' do + expect(@instance).to be_instance_of(Petstore::OuterEnumInteger) + end + end +end diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java index 1554bbad0d6..26823eb49c5 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java @@ -20,6 +20,9 @@ import com.fasterxml.jackson.annotation.JsonValue; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.openapitools.model.OuterEnum; +import org.openapitools.model.OuterEnumDefaultValue; +import org.openapitools.model.OuterEnumInteger; +import org.openapitools.model.OuterEnumIntegerDefaultValue; import javax.validation.constraints.*; import javax.validation.Valid; @@ -171,6 +174,15 @@ public class EnumTest { @JsonProperty("outerEnum") private OuterEnum outerEnum; + @JsonProperty("outerEnumInteger") + private OuterEnumInteger outerEnumInteger; + + @JsonProperty("outerEnumDefaultValue") + private OuterEnumDefaultValue outerEnumDefaultValue = OuterEnumDefaultValue.PLACED; + + @JsonProperty("outerEnumIntegerDefaultValue") + private OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValue.NUMBER_0; + public EnumTest enumString(EnumStringEnum enumString) { this.enumString = enumString; return this; @@ -272,6 +284,66 @@ public class EnumTest { this.outerEnum = outerEnum; } + public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) { + this.outerEnumInteger = outerEnumInteger; + return this; + } + + /** + * Get outerEnumInteger + * @return outerEnumInteger + **/ + @JsonProperty("outerEnumInteger") + @ApiModelProperty(value = "") + @Valid + public OuterEnumInteger getOuterEnumInteger() { + return outerEnumInteger; + } + + public void setOuterEnumInteger(OuterEnumInteger outerEnumInteger) { + this.outerEnumInteger = outerEnumInteger; + } + + public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue) { + this.outerEnumDefaultValue = outerEnumDefaultValue; + return this; + } + + /** + * Get outerEnumDefaultValue + * @return outerEnumDefaultValue + **/ + @JsonProperty("outerEnumDefaultValue") + @ApiModelProperty(value = "") + @Valid + public OuterEnumDefaultValue getOuterEnumDefaultValue() { + return outerEnumDefaultValue; + } + + public void setOuterEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue) { + this.outerEnumDefaultValue = outerEnumDefaultValue; + } + + public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) { + this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; + return this; + } + + /** + * Get outerEnumIntegerDefaultValue + * @return outerEnumIntegerDefaultValue + **/ + @JsonProperty("outerEnumIntegerDefaultValue") + @ApiModelProperty(value = "") + @Valid + public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() { + return outerEnumIntegerDefaultValue; + } + + public void setOuterEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) { + this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue; + } + @Override public boolean equals(java.lang.Object o) { @@ -286,12 +358,15 @@ public class EnumTest { Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(this.enumNumber, enumTest.enumNumber) && - Objects.equals(this.outerEnum, enumTest.outerEnum); + Objects.equals(this.outerEnum, enumTest.outerEnum) && + Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) && + Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) && + Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue); } @Override public int hashCode() { - return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum); + return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue); } @@ -305,6 +380,9 @@ public class EnumTest { sb.append(" enumInteger: ").append(toIndentedString(enumInteger)).append("\n"); sb.append(" enumNumber: ").append(toIndentedString(enumNumber)).append("\n"); sb.append(" outerEnum: ").append(toIndentedString(outerEnum)).append("\n"); + sb.append(" outerEnumInteger: ").append(toIndentedString(outerEnumInteger)).append("\n"); + sb.append(" outerEnumDefaultValue: ").append(toIndentedString(outerEnumDefaultValue)).append("\n"); + sb.append(" outerEnumIntegerDefaultValue: ").append(toIndentedString(outerEnumIntegerDefaultValue)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java new file mode 100644 index 00000000000..9273bdae561 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java @@ -0,0 +1,61 @@ +/* + * OpenAPI Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonValue; +import javax.validation.constraints.*; +import javax.validation.Valid; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets OuterEnumDefaultValue + */ +public enum OuterEnumDefaultValue { + + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + + private String value; + + OuterEnumDefaultValue(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OuterEnumDefaultValue fromValue(String text) { + for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java new file mode 100644 index 00000000000..25c7388535c --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumInteger.java @@ -0,0 +1,61 @@ +/* + * OpenAPI Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonValue; +import javax.validation.constraints.*; +import javax.validation.Valid; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets OuterEnumInteger + */ +public enum OuterEnumInteger { + + NUMBER_0(0), + + NUMBER_1(1), + + NUMBER_2(2); + + private Integer value; + + OuterEnumInteger(Integer value) { + this.value = value; + } + + @JsonValue + public Integer getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OuterEnumInteger fromValue(String text) { + for (OuterEnumInteger b : OuterEnumInteger.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } +} + diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java new file mode 100644 index 00000000000..3edfdffcaa2 --- /dev/null +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java @@ -0,0 +1,61 @@ +/* + * OpenAPI Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * OpenAPI spec version: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.model; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonValue; +import javax.validation.constraints.*; +import javax.validation.Valid; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets OuterEnumIntegerDefaultValue + */ +public enum OuterEnumIntegerDefaultValue { + + NUMBER_0(0), + + NUMBER_1(1), + + NUMBER_2(2); + + private Integer value; + + OuterEnumIntegerDefaultValue(Integer value) { + this.value = value; + } + + @JsonValue + public Integer getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OuterEnumIntegerDefaultValue fromValue(String text) { + for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) { + if (String.valueOf(b.value).equals(text)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + text + "'"); + } +} +