From 39f5a308f6f41d62e8e4948f52cfb48c8cfbdfc0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 09:25:35 -0700 Subject: [PATCH 1/9] Uses unaliasSchema rather than ModelUtils.getReferencedSchema --- .../openapitools/codegen/DefaultCodegen.java | 21 +++++++++++-------- .../.openapi-generator/VERSION | 2 +- .../python-experimental/docs/FakeApi.md | 9 ++++---- .../query_parameter_collection_format.py | 12 +++-------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 2cf54cbe650f..553916c58a9b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4579,10 +4579,12 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) // the parameter model name is obtained from the schema $ref // e.g. #/components/schemas/list_pageQuery_parameter => toModelName(list_pageQuery_parameter) String parameterModelName = null; + HashMap importMapping = new HashMap<>(); if (parameter.getSchema() != null) { parameterModelName = getParameterDataType(parameter ,parameter.getSchema()); - parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameter.getSchema()); + parameterSchema = unaliasSchema(parameter.getSchema(), importMapping); + // parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameter.getSchema()); CodegenProperty prop = fromProperty(parameter.getName(), parameterSchema); codegenParameter.setSchema(prop); } else if (parameter.getContent() != null) { @@ -4593,7 +4595,8 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) Map.Entry entry = content.entrySet().iterator().next(); codegenParameter.contentType = entry.getKey(); parameterModelName = getParameterDataType(parameter, entry.getValue().getSchema()); - parameterSchema = ModelUtils.getReferencedSchema(openAPI, entry.getValue().getSchema()); + parameterSchema = unaliasSchema(entry.getValue().getSchema(), importMapping); + // parameterSchema = ModelUtils.getReferencedSchema(openAPI, entry.getValue().getSchema()); } else { parameterSchema = null; } @@ -4618,13 +4621,13 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) return codegenParameter; } - parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); - if (parameterSchema == null) { - LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); - parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); - finishUpdatingParameter(codegenParameter, parameter); - return codegenParameter; - } +// parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); +// if (parameterSchema == null) { +// LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); +// parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); +// finishUpdatingParameter(codegenParameter, parameter); +// return codegenParameter; +// } ModelUtils.syncValidationProperties(parameterSchema, codegenParameter); codegenParameter.setTypeProperties(parameterSchema); codegenParameter.setComposedSchemas(getComposedSchemas(parameterSchema)); diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION index 5f68295fc196..717311e32e3c 100644 --- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION @@ -1 +1 @@ -6.0.0-SNAPSHOT \ No newline at end of file +unset \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md index 696fd93466d0..cd82dc35870e 100644 --- a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md @@ -2446,6 +2446,7 @@ To test the collection format in query parameters ```python import petstore_api from petstore_api.api import fake_api +from petstore_api.model.string_with_validation import StringWithValidation from pprint import pprint # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2 # See configuration.py for a list of all supported configuration parameters. @@ -2537,10 +2538,10 @@ Type | Description | Notes **[str]** | | #### RefParamSchema - -Type | Description | Notes +Type | Description | Notes ------------- | ------------- | ------------- -**str** | | +[**StringWithValidation**](StringWithValidation.md) | | + ### Return Types, Responses @@ -2622,7 +2623,7 @@ mapBean | MapBeanSchema | | optional #### MapBeanSchema Type | Description | Notes ------------- | ------------- | ------------- -[**{str: (bool, date, datetime, dict, float, int, list, str, none_type)}**](Foo.md) | | +[**Foo**](Foo.md) | | ### Return Types, Responses diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py index f4bfe081b0f0..a699b9cc2490 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/query_parameter_collection_format.py @@ -63,6 +63,8 @@ _SchemaEnumMaker ) +from petstore_api.model.string_with_validation import StringWithValidation + # query params @@ -94,15 +96,7 @@ class ContextSchema( ListSchema ): _items = StrSchema - - -class RefParamSchema( - _SchemaValidator( - min_length=7, - ), - StrSchema -): - pass +RefParamSchema = StringWithValidation RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', { From 9ce58a0be49110478ffa92e0b396f797dc37e16b Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 09:37:52 -0700 Subject: [PATCH 2/9] Fixes python-experimental, delays param schema setting --- .../openapitools/codegen/DefaultCodegen.java | 32 +-- .../IJsonSchemaValidationProperties.java | 10 +- .../api/default_api_endpoints/foo_get.py | 27 ++- .../fake_api_endpoints/endpoint_parameters.py | 132 ++++++++++- .../api/fake_api_endpoints/enum_parameters.py | 77 ++++++- .../fake_api_endpoints/inline_composition.py | 216 +++++++++++++++++- .../api/fake_api_endpoints/json_form_data.py | 24 +- .../api/fake_api_endpoints/object_in_query.py | 23 +- .../api/fake_api_endpoints/upload_file.py | 26 ++- .../api/fake_api_endpoints/upload_files.py | 28 ++- .../pet_api_endpoints/update_pet_with_form.py | 26 ++- .../upload_file_with_required_file.py | 26 ++- .../api/pet_api_endpoints/upload_image.py | 24 +- .../model/additional_properties_class.py | 142 +++++++++++- .../petstore_api/model/animal.py | 44 +++- .../petstore_api/model/api_response.py | 34 ++- .../petstore_api/model/apple.py | 33 ++- .../petstore_api/model/apple_req.py | 33 ++- .../model/array_of_array_of_number_only.py | 38 ++- .../model/array_of_number_only.py | 33 ++- .../petstore_api/model/array_test.py | 63 ++++- .../petstore_api/model/banana.py | 31 ++- .../petstore_api/model/banana_req.py | 33 ++- .../petstore_api/model/basque_pig.py | 45 +++- .../petstore_api/model/capitalization.py | 43 +++- .../petstore_api/model/cat.py | 23 +- .../petstore_api/model/category.py | 34 ++- .../petstore_api/model/child_cat.py | 23 +- .../petstore_api/model/class_model.py | 29 ++- .../petstore_api/model/client.py | 28 ++- .../model/complex_quadrilateral.py | 37 ++- .../petstore_api/model/danish_pig.py | 45 +++- .../petstore_api/model/dog.py | 23 +- .../petstore_api/model/enum_arrays.py | 76 +++++- .../petstore_api/model/enum_test.py | 167 +++++++++++++- .../model/equilateral_triangle.py | 37 ++- .../petstore_api/model/file.py | 30 ++- .../model/file_schema_test_class.py | 44 +++- .../petstore_api/model/foo.py | 28 ++- .../petstore_api/model/format_test.py | 194 +++++++++++++++- .../petstore_api/model/fruit.py | 5 +- .../petstore_api/model/gm_fruit.py | 5 +- .../petstore_api/model/grandparent_animal.py | 41 +++- .../petstore_api/model/has_only_read_only.py | 31 ++- .../petstore_api/model/health_check_result.py | 48 +++- .../petstore_api/model/isosceles_triangle.py | 37 ++- .../petstore_api/model/map_test.py | 137 ++++++++++- ...perties_and_additional_properties_class.py | 57 ++++- .../petstore_api/model/model200_response.py | 32 ++- .../petstore_api/model/model_return.py | 29 ++- .../petstore_api/model/money.py | 39 +++- .../petstore_api/model/name.py | 38 ++- .../model/no_additional_properties.py | 33 ++- .../petstore_api/model/number_only.py | 28 ++- .../model/object_model_with_ref_props.py | 40 +++- .../model/object_with_decimal_properties.py | 38 ++- .../object_with_difficultly_named_props.py | 39 +++- ...object_with_inline_composition_property.py | 77 ++++++- .../petstore_api/model/order.py | 69 +++++- .../petstore_api/model/pet.py | 93 +++++++- .../petstore_api/model/player.py | 37 ++- .../model/quadrilateral_interface.py | 48 +++- .../petstore_api/model/read_only_first.py | 31 ++- .../petstore_api/model/scalene_triangle.py | 37 ++- .../model/simple_quadrilateral.py | 37 ++- .../petstore_api/model/special_model_name.py | 30 ++- .../petstore_api/model/tag.py | 31 ++- .../petstore_api/model/triangle_interface.py | 48 +++- .../petstore_api/model/user.py | 124 +++++++++- .../petstore_api/model/whale.py | 51 ++++- 70 files changed, 3360 insertions(+), 91 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 553916c58a9b..9c7dbfeb41cf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4581,12 +4581,10 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) String parameterModelName = null; HashMap importMapping = new HashMap<>(); + boolean needToSetSchema = false; if (parameter.getSchema() != null) { - parameterModelName = getParameterDataType(parameter ,parameter.getSchema()); - parameterSchema = unaliasSchema(parameter.getSchema(), importMapping); - // parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameter.getSchema()); - CodegenProperty prop = fromProperty(parameter.getName(), parameterSchema); - codegenParameter.setSchema(prop); + parameterSchema = parameter.getSchema(); + needToSetSchema = true; } else if (parameter.getContent() != null) { Content content = parameter.getContent(); if (content.size() > 1) { @@ -4594,9 +4592,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) } Map.Entry entry = content.entrySet().iterator().next(); codegenParameter.contentType = entry.getKey(); - parameterModelName = getParameterDataType(parameter, entry.getValue().getSchema()); - parameterSchema = unaliasSchema(entry.getValue().getSchema(), importMapping); - // parameterSchema = ModelUtils.getReferencedSchema(openAPI, entry.getValue().getSchema()); + parameterSchema = entry.getValue().getSchema(); } else { parameterSchema = null; } @@ -4621,13 +4617,19 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) return codegenParameter; } -// parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); -// if (parameterSchema == null) { -// LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); -// parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); -// finishUpdatingParameter(codegenParameter, parameter); -// return codegenParameter; -// } + parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); + if (parameterSchema == null) { + LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); + parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); + finishUpdatingParameter(codegenParameter, parameter); + return codegenParameter; + } + + if (needToSetSchema) { + CodegenProperty prop = fromProperty(parameter.getName(), parameterSchema); + codegenParameter.setSchema(prop); + } + ModelUtils.syncValidationProperties(parameterSchema, codegenParameter); codegenParameter.setTypeProperties(parameterSchema); codegenParameter.setComposedSchemas(getComposedSchemas(parameterSchema)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java index 02330b8858b4..c3cc9a13032a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java @@ -168,10 +168,11 @@ public interface IJsonSchemaValidationProperties { * @param p the schema which contains the type info */ default void setTypeProperties(Schema p) { - if (ModelUtils.isModelWithPropertiesOnly(p)) { - setIsModel(true); - } else if (ModelUtils.isTypeObjectSchema(p)) { + if (ModelUtils.isTypeObjectSchema(p)) { setIsMap(true); + if (ModelUtils.isModelWithPropertiesOnly(p)) { + setIsModel(true); + } } else if (ModelUtils.isArraySchema(p)) { setIsArray(true); } else if (ModelUtils.isFileSchema(p) && !ModelUtils.isStringSchema(p)) { @@ -221,6 +222,9 @@ default void setTypeProperties(Schema p) { setIsNull(true); } else if (ModelUtils.isAnyType(p)) { setIsAnyType(true); + if (ModelUtils.isModelWithPropertiesOnly(p)) { + setIsModel(true); + } } } diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py index 410b62d8ef3e..d671e247cb84 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api_endpoints/foo_get.py @@ -68,7 +68,32 @@ _path = '/foo' _method = 'GET' -SchemaFor0ResponseBodyApplicationJson = Schema + + +class SchemaFor0ResponseBodyApplicationJson( + DictSchema +): + + @classmethod + @property + def string(cls) -> typing.Type['Foo']: + return Foo + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + string: typing.Union['Foo', Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaFor0ResponseBodyApplicationJson': + return super().__new__( + cls, + *args, + string=string, + _configuration=_configuration, + **kwargs, + ) @dataclass diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py index 554a0ad13700..fbe686c3d13e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/endpoint_parameters.py @@ -65,7 +65,137 @@ ) # body param -SchemaForRequestBodyApplicationXWwwFormUrlencoded = Schema + + +class SchemaForRequestBodyApplicationXWwwFormUrlencoded( + DictSchema +): + _required_property_names = set(( + )) + + + class integer( + _SchemaValidator( + inclusive_maximum=100, + inclusive_minimum=10, + ), + IntSchema + ): + pass + + + class int32( + _SchemaValidator( + inclusive_maximum=200, + inclusive_minimum=20, + ), + Int32Schema + ): + pass + int64 = Int64Schema + + + class number( + _SchemaValidator( + inclusive_maximum=543.2, + inclusive_minimum=32.1, + ), + NumberSchema + ): + pass + + + class _float( + _SchemaValidator( + inclusive_maximum=987.6, + ), + Float32Schema + ): + pass + locals()['float'] = _float + del locals()['_float'] + + + class double( + _SchemaValidator( + inclusive_maximum=123.4, + inclusive_minimum=67.8, + ), + Float64Schema + ): + pass + + + class string( + _SchemaValidator( + regex=[{ + 'pattern': r'[a-z]', # noqa: E501 + 'flags': ( + re.IGNORECASE + ) + }], + ), + StrSchema + ): + pass + + + class pattern_without_delimiter( + _SchemaValidator( + regex=[{ + 'pattern': r'^[A-Z].*', # noqa: E501 + }], + ), + StrSchema + ): + pass + byte = StrSchema + binary = BinarySchema + date = DateSchema + dateTime = DateTimeSchema + + + class password( + _SchemaValidator( + max_length=64, + min_length=10, + ), + StrSchema + ): + pass + callback = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + integer: typing.Union[integer, Unset] = unset, + int32: typing.Union[int32, Unset] = unset, + int64: typing.Union[int64, Unset] = unset, + string: typing.Union[string, Unset] = unset, + binary: typing.Union[binary, Unset] = unset, + date: typing.Union[date, Unset] = unset, + dateTime: typing.Union[dateTime, Unset] = unset, + password: typing.Union[password, Unset] = unset, + callback: typing.Union[callback, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': + return super().__new__( + cls, + *args, + integer=integer, + int32=int32, + int64=int64, + string=string, + binary=binary, + date=date, + dateTime=dateTime, + password=password, + callback=callback, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py index 5ab3e3f6b022..9e7fcd818071 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/enum_parameters.py @@ -289,7 +289,82 @@ class RequestHeaderParams(RequestRequiredHeaderParams, RequestOptionalHeaderPara schema=EnumHeaderStringSchema, ) # body param -SchemaForRequestBodyApplicationXWwwFormUrlencoded = Schema + + +class SchemaForRequestBodyApplicationXWwwFormUrlencoded( + DictSchema +): + + + class enum_form_string_array( + ListSchema + ): + + + class _items( + _SchemaEnumMaker( + enum_value_to_name={ + ">": "GREATER_THAN", + "$": "DOLLAR", + } + ), + StrSchema + ): + + @classmethod + @property + def GREATER_THAN(cls): + return cls(">") + + @classmethod + @property + def DOLLAR(cls): + return cls("$") + + + class enum_form_string( + _SchemaEnumMaker( + enum_value_to_name={ + "_abc": "_ABC", + "-efg": "EFG", + "(xyz)": "XYZ", + } + ), + StrSchema + ): + + @classmethod + @property + def _ABC(cls): + return cls("_abc") + + @classmethod + @property + def EFG(cls): + return cls("-efg") + + @classmethod + @property + def XYZ(cls): + return cls("(xyz)") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + enum_form_string_array: typing.Union[enum_form_string_array, Unset] = unset, + enum_form_string: typing.Union[enum_form_string, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': + return super().__new__( + cls, + *args, + enum_form_string_array=enum_form_string_array, + enum_form_string=enum_form_string, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py index 6ec8f4b71197..352df0a9d79d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/inline_composition.py @@ -115,7 +115,77 @@ def __new__( _configuration=_configuration, **kwargs, ) -CompositionInPropertySchema = Schema + + +class CompositionInPropertySchema( + DictSchema +): + + + class someProp( + ComposedSchema + ): + + @classmethod + @property + @functools.cache + def _composed_schemas(cls): + # we need this here to make our import statements work + # we must store _composed_schemas in here so the code is only run + # when we invoke this method. If we kept this at the class + # level we would get an error because the class level + # code would be run when this module is imported, and these composed + # classes don't exist yet because their module has not finished + # loading + + + class allOf_0( + _SchemaValidator( + min_length=1, + ), + StrSchema + ): + pass + return { + 'allOf': [ + allOf_0, + ], + 'oneOf': [ + ], + 'anyOf': [ + ], + 'not': + None + } + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'someProp': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + someProp: typing.Union[someProp, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'CompositionInPropertySchema': + return super().__new__( + cls, + *args, + someProp=someProp, + _configuration=_configuration, + **kwargs, + ) RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', { @@ -198,7 +268,77 @@ def __new__( _configuration=_configuration, **kwargs, ) -SchemaForRequestBodyMultipartFormData = Schema + + +class SchemaForRequestBodyMultipartFormData( + DictSchema +): + + + class someProp( + ComposedSchema + ): + + @classmethod + @property + @functools.cache + def _composed_schemas(cls): + # we need this here to make our import statements work + # we must store _composed_schemas in here so the code is only run + # when we invoke this method. If we kept this at the class + # level we would get an error because the class level + # code would be run when this module is imported, and these composed + # classes don't exist yet because their module has not finished + # loading + + + class allOf_0( + _SchemaValidator( + min_length=1, + ), + StrSchema + ): + pass + return { + 'allOf': [ + allOf_0, + ], + 'oneOf': [ + ], + 'anyOf': [ + ], + 'not': + None + } + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'someProp': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + someProp: typing.Union[someProp, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyMultipartFormData': + return super().__new__( + cls, + *args, + someProp=someProp, + _configuration=_configuration, + **kwargs, + ) request_body_any_type = api_client.RequestBody( @@ -261,7 +401,77 @@ def __new__( _configuration=_configuration, **kwargs, ) -SchemaFor200ResponseBodyMultipartFormData = Schema + + +class SchemaFor200ResponseBodyMultipartFormData( + DictSchema +): + + + class someProp( + ComposedSchema + ): + + @classmethod + @property + @functools.cache + def _composed_schemas(cls): + # we need this here to make our import statements work + # we must store _composed_schemas in here so the code is only run + # when we invoke this method. If we kept this at the class + # level we would get an error because the class level + # code would be run when this module is imported, and these composed + # classes don't exist yet because their module has not finished + # loading + + + class allOf_0( + _SchemaValidator( + min_length=1, + ), + StrSchema + ): + pass + return { + 'allOf': [ + allOf_0, + ], + 'oneOf': [ + ], + 'anyOf': [ + ], + 'not': + None + } + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'someProp': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + someProp: typing.Union[someProp, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaFor200ResponseBodyMultipartFormData': + return super().__new__( + cls, + *args, + someProp=someProp, + _configuration=_configuration, + **kwargs, + ) @dataclass diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py index 5e7ef41fc8d3..acd9f45f01d7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/json_form_data.py @@ -65,7 +65,29 @@ ) # body param -SchemaForRequestBodyApplicationXWwwFormUrlencoded = Schema + + +class SchemaForRequestBodyApplicationXWwwFormUrlencoded( + DictSchema +): + _required_property_names = set(( + )) + param = StrSchema + param2 = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_in_query.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_in_query.py index 6622b5c5a3d9..674c383d599f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_in_query.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/object_in_query.py @@ -64,7 +64,28 @@ ) # query params -MapBeanSchema = Schema + + +class MapBeanSchema( + DictSchema +): + keyword = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + keyword: typing.Union[keyword, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'MapBeanSchema': + return super().__new__( + cls, + *args, + keyword=keyword, + _configuration=_configuration, + **kwargs, + ) RequestRequiredQueryParams = typing.TypedDict( 'RequestRequiredQueryParams', { diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py index 6923593026cf..66a2e5dcd469 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_file.py @@ -67,7 +67,31 @@ from petstore_api.model.api_response import ApiResponse # body param -SchemaForRequestBodyMultipartFormData = Schema + + +class SchemaForRequestBodyMultipartFormData( + DictSchema +): + _required_property_names = set(( + )) + additionalMetadata = StrSchema + file = BinarySchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyMultipartFormData': + return super().__new__( + cls, + *args, + additionalMetadata=additionalMetadata, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py index 393c85680137..a9461e803a48 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api_endpoints/upload_files.py @@ -67,7 +67,33 @@ from petstore_api.model.api_response import ApiResponse # body param -SchemaForRequestBodyMultipartFormData = Schema + + +class SchemaForRequestBodyMultipartFormData( + DictSchema +): + + + class files( + ListSchema + ): + _items = BinarySchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + files: typing.Union[files, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyMultipartFormData': + return super().__new__( + cls, + *args, + files=files, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py index 5c972d944d0e..47012f008d1f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/update_pet_with_form.py @@ -91,7 +91,31 @@ class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams): required=True, ) # body param -SchemaForRequestBodyApplicationXWwwFormUrlencoded = Schema + + +class SchemaForRequestBodyApplicationXWwwFormUrlencoded( + DictSchema +): + name = StrSchema + status = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + name: typing.Union[name, Unset] = unset, + status: typing.Union[status, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyApplicationXWwwFormUrlencoded': + return super().__new__( + cls, + *args, + name=name, + status=status, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py index 80d7bf85baa0..26629273ee0c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_file_with_required_file.py @@ -93,7 +93,31 @@ class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams): required=True, ) # body param -SchemaForRequestBodyMultipartFormData = Schema + + +class SchemaForRequestBodyMultipartFormData( + DictSchema +): + _required_property_names = set(( + )) + additionalMetadata = StrSchema + requiredFile = BinarySchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyMultipartFormData': + return super().__new__( + cls, + *args, + additionalMetadata=additionalMetadata, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py index 7a231b110f9a..80ed3f149bef 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api_endpoints/upload_image.py @@ -93,7 +93,29 @@ class RequestPathParams(RequestRequiredPathParams, RequestOptionalPathParams): required=True, ) # body param -SchemaForRequestBodyMultipartFormData = Schema + + +class SchemaForRequestBodyMultipartFormData( + DictSchema +): + additionalMetadata = StrSchema + file = BinarySchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + additionalMetadata: typing.Union[additionalMetadata, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SchemaForRequestBodyMultipartFormData': + return super().__new__( + cls, + *args, + additionalMetadata=additionalMetadata, + _configuration=_configuration, + **kwargs, + ) request_body_body = api_client.RequestBody( diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py index 626bd6b6cf7d..5ccf44cceb0a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/additional_properties_class.py @@ -64,4 +64,144 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -AdditionalPropertiesClass = Schema + + +class AdditionalPropertiesClass( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class map_property( + DictSchema + ): + _additional_properties = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map_property': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + class map_of_map_property( + DictSchema + ): + + + class _additional_properties( + DictSchema + ): + _additional_properties = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> '_additional_properties': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map_of_map_property': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + anytype_1 = AnyTypeSchema + map_with_undeclared_properties_anytype_1 = DictSchema + map_with_undeclared_properties_anytype_2 = DictSchema + map_with_undeclared_properties_anytype_3 = DictSchema + + + class empty_map( + DictSchema + ): + _additional_properties = None + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + ) -> 'empty_map': + return super().__new__( + cls, + *args, + _configuration=_configuration, + ) + + + class map_with_undeclared_properties_string( + DictSchema + ): + _additional_properties = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map_with_undeclared_properties_string': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + map_property: typing.Union[map_property, Unset] = unset, + map_of_map_property: typing.Union[map_of_map_property, Unset] = unset, + anytype_1: typing.Union[anytype_1, Unset] = unset, + map_with_undeclared_properties_anytype_1: typing.Union[map_with_undeclared_properties_anytype_1, Unset] = unset, + map_with_undeclared_properties_anytype_2: typing.Union[map_with_undeclared_properties_anytype_2, Unset] = unset, + map_with_undeclared_properties_anytype_3: typing.Union[map_with_undeclared_properties_anytype_3, Unset] = unset, + empty_map: typing.Union[empty_map, Unset] = unset, + map_with_undeclared_properties_string: typing.Union[map_with_undeclared_properties_string, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'AdditionalPropertiesClass': + return super().__new__( + cls, + *args, + map_property=map_property, + map_of_map_property=map_of_map_property, + anytype_1=anytype_1, + map_with_undeclared_properties_anytype_1=map_with_undeclared_properties_anytype_1, + map_with_undeclared_properties_anytype_2=map_with_undeclared_properties_anytype_2, + map_with_undeclared_properties_anytype_3=map_with_undeclared_properties_anytype_3, + empty_map=empty_map, + map_with_undeclared_properties_string=map_with_undeclared_properties_string, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py index 539b384eb67f..92b478614a3a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal.py @@ -64,7 +64,49 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Animal = Schema + + +class Animal( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'className', + )) + className = StrSchema + color = StrSchema + + @classmethod + @property + def _discriminator(cls): + return { + 'className': { + 'Cat': Cat, + 'Dog': Dog, + } + } + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + className: className, + color: typing.Union[color, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Animal': + return super().__new__( + cls, + *args, + className=className, + color=color, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.cat import Cat from petstore_api.model.dog import Dog diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py index c6d6f258e08c..669e8c14366a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/api_response.py @@ -64,4 +64,36 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ApiResponse = Schema + + +class ApiResponse( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + code = Int32Schema + type = StrSchema + message = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + code: typing.Union[code, Unset] = unset, + type: typing.Union[type, Unset] = unset, + message: typing.Union[message, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ApiResponse': + return super().__new__( + cls, + *args, + code=code, + type=type, + message=message, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py index 8226e61bde82..107b8ad0c56a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple.py @@ -67,7 +67,8 @@ class Apple( - _SchemaTypeChecker(typing.Union[none_type, ]), + _SchemaTypeChecker(typing.Union[frozendict, none_type, ]), + DictBase, NoneBase, Schema ): @@ -76,10 +77,38 @@ class Apple( Do not edit the class manually. """ + _required_property_names = set(( + 'cultivar', + )) + + + class cultivar( + _SchemaValidator( + regex=[{ + 'pattern': r'^[a-zA-Z\s]*$', # noqa: E501 + }], + ), + StrSchema + ): + pass + + + class origin( + _SchemaValidator( + regex=[{ + 'pattern': r'^[A-Z\s]*$', # noqa: E501 + 'flags': ( + re.IGNORECASE + ) + }], + ), + StrSchema + ): + pass def __new__( cls, - *args: typing.Union[None, ], + *args: typing.Union[dict, frozendict, None, ], origin: typing.Union[origin, Unset] = unset, _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py index 11dc87a6a2c9..71519bb0ee06 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/apple_req.py @@ -64,4 +64,35 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -AppleReq = Schema + + +class AppleReq( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'cultivar', + )) + cultivar = StrSchema + mealy = BoolSchema + _additional_properties = None + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + cultivar: cultivar, + mealy: typing.Union[mealy, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + ) -> 'AppleReq': + return super().__new__( + cls, + *args, + cultivar=cultivar, + mealy=mealy, + _configuration=_configuration, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py index 5f61f4de5985..3f73c652b89a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_array_of_number_only.py @@ -64,4 +64,40 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ArrayOfArrayOfNumberOnly = Schema + + +class ArrayOfArrayOfNumberOnly( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class ArrayArrayNumber( + ListSchema + ): + + + class _items( + ListSchema + ): + _items = NumberSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + ArrayArrayNumber: typing.Union[ArrayArrayNumber, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ArrayOfArrayOfNumberOnly': + return super().__new__( + cls, + *args, + ArrayArrayNumber=ArrayArrayNumber, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py index cdfbf3d2079c..2e32429c76f1 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_number_only.py @@ -64,4 +64,35 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ArrayOfNumberOnly = Schema + + +class ArrayOfNumberOnly( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class ArrayNumber( + ListSchema + ): + _items = NumberSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + ArrayNumber: typing.Union[ArrayNumber, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ArrayOfNumberOnly': + return super().__new__( + cls, + *args, + ArrayNumber=ArrayNumber, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py index eac70d72c86f..ccb8e8364e37 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_test.py @@ -64,6 +64,67 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ArrayTest = Schema + + +class ArrayTest( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class array_of_string( + ListSchema + ): + _items = StrSchema + + + class array_array_of_integer( + ListSchema + ): + + + class _items( + ListSchema + ): + _items = Int64Schema + + + class array_array_of_model( + ListSchema + ): + + + class _items( + ListSchema + ): + + @classmethod + @property + def _items(cls) -> typing.Type['ReadOnlyFirst']: + return ReadOnlyFirst + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + array_of_string: typing.Union[array_of_string, Unset] = unset, + array_array_of_integer: typing.Union[array_array_of_integer, Unset] = unset, + array_array_of_model: typing.Union[array_array_of_model, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ArrayTest': + return super().__new__( + cls, + *args, + array_of_string=array_of_string, + array_array_of_integer=array_array_of_integer, + array_array_of_model=array_array_of_model, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.read_only_first import ReadOnlyFirst diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py index 93b82b5d72a4..32fd6d33aba7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana.py @@ -64,4 +64,33 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Banana = Schema + + +class Banana( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'lengthCm', + )) + lengthCm = NumberSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + lengthCm: lengthCm, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Banana': + return super().__new__( + cls, + *args, + lengthCm=lengthCm, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py index 50754f7bc936..eef932bcc170 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/banana_req.py @@ -64,4 +64,35 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -BananaReq = Schema + + +class BananaReq( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'lengthCm', + )) + lengthCm = NumberSchema + sweet = BoolSchema + _additional_properties = None + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + lengthCm: lengthCm, + sweet: typing.Union[sweet, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + ) -> 'BananaReq': + return super().__new__( + cls, + *args, + lengthCm=lengthCm, + sweet=sweet, + _configuration=_configuration, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py index 6e52632f989e..1be687ece164 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/basque_pig.py @@ -64,4 +64,47 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -BasquePig = Schema + + +class BasquePig( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'className', + )) + + + class className( + _SchemaEnumMaker( + enum_value_to_name={ + "BasquePig": "BASQUEPIG", + } + ), + StrSchema + ): + + @classmethod + @property + def BASQUEPIG(cls): + return cls("BasquePig") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + className: className, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'BasquePig': + return super().__new__( + cls, + *args, + className=className, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py index 22d48edbfd7c..698d6b5eb3bc 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/capitalization.py @@ -64,4 +64,45 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Capitalization = Schema + + +class Capitalization( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + smallCamel = StrSchema + CapitalCamel = StrSchema + small_Snake = StrSchema + Capital_Snake = StrSchema + SCA_ETH_Flow_Points = StrSchema + ATT_NAME = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + smallCamel: typing.Union[smallCamel, Unset] = unset, + CapitalCamel: typing.Union[CapitalCamel, Unset] = unset, + small_Snake: typing.Union[small_Snake, Unset] = unset, + Capital_Snake: typing.Union[Capital_Snake, Unset] = unset, + SCA_ETH_Flow_Points: typing.Union[SCA_ETH_Flow_Points, Unset] = unset, + ATT_NAME: typing.Union[ATT_NAME, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Capitalization': + return super().__new__( + cls, + *args, + smallCamel=smallCamel, + CapitalCamel=CapitalCamel, + small_Snake=small_Snake, + Capital_Snake=Capital_Snake, + SCA_ETH_Flow_Points=SCA_ETH_Flow_Points, + ATT_NAME=ATT_NAME, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py index 1990a3827ab8..e43e618a4419 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/cat.py @@ -86,7 +86,28 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + declawed = BoolSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + declawed: typing.Union[declawed, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + declawed=declawed, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ Animal, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py index e2599c0c4ee4..9cf45a54e988 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/category.py @@ -64,4 +64,36 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Category = Schema + + +class Category( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'name', + )) + id = Int64Schema + name = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + name: name, + id: typing.Union[id, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Category': + return super().__new__( + cls, + *args, + name=name, + id=id, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py index da5ecd9695cb..381628a1d706 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/child_cat.py @@ -86,7 +86,28 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + name = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + name: typing.Union[name, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + name=name, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ ParentPet, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py index 60b5a7685fe7..a79a2afefce9 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/class_model.py @@ -64,4 +64,31 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ClassModel = Schema + + +class ClassModel( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Model for testing model with "_class" property + """ + _class = StrSchema + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _class: typing.Union[_class, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ClassModel': + return super().__new__( + cls, + *args, + _class=_class, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py index 1cd9af3149f2..976072a8b311 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/client.py @@ -64,4 +64,30 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Client = Schema + + +class Client( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + client = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + client: typing.Union[client, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Client': + return super().__new__( + cls, + *args, + client=client, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py index 3d340d7ad716..e5a46fb124d2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/complex_quadrilateral.py @@ -86,7 +86,42 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + + + class quadrilateralType( + _SchemaEnumMaker( + enum_value_to_name={ + "ComplexQuadrilateral": "COMPLEXQUADRILATERAL", + } + ), + StrSchema + ): + + @classmethod + @property + def COMPLEXQUADRILATERAL(cls): + return cls("ComplexQuadrilateral") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + quadrilateralType: typing.Union[quadrilateralType, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + quadrilateralType=quadrilateralType, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ QuadrilateralInterface, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py index 12d8ab5fd6cd..ec281c4eff69 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/danish_pig.py @@ -64,4 +64,47 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -DanishPig = Schema + + +class DanishPig( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'className', + )) + + + class className( + _SchemaEnumMaker( + enum_value_to_name={ + "DanishPig": "DANISHPIG", + } + ), + StrSchema + ): + + @classmethod + @property + def DANISHPIG(cls): + return cls("DanishPig") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + className: className, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'DanishPig': + return super().__new__( + cls, + *args, + className=className, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py index 32008dcb028f..ff4331001290 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/dog.py @@ -86,7 +86,28 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + breed = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + breed: typing.Union[breed, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + breed=breed, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ Animal, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py index ca49742fbfc6..7061dcbac014 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_arrays.py @@ -64,4 +64,78 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -EnumArrays = Schema + + +class EnumArrays( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class just_symbol( + _SchemaEnumMaker( + enum_value_to_name={ + ">=": "GREATER_THAN_EQUALS", + "$": "DOLLAR", + } + ), + StrSchema + ): + + @classmethod + @property + def GREATER_THAN_EQUALS(cls): + return cls(">=") + + @classmethod + @property + def DOLLAR(cls): + return cls("$") + + + class array_enum( + ListSchema + ): + + + class _items( + _SchemaEnumMaker( + enum_value_to_name={ + "fish": "FISH", + "crab": "CRAB", + } + ), + StrSchema + ): + + @classmethod + @property + def FISH(cls): + return cls("fish") + + @classmethod + @property + def CRAB(cls): + return cls("crab") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + just_symbol: typing.Union[just_symbol, Unset] = unset, + array_enum: typing.Union[array_enum, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'EnumArrays': + return super().__new__( + cls, + *args, + just_symbol=just_symbol, + array_enum=array_enum, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py index 35ce843811d1..965f861eb53f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/enum_test.py @@ -64,7 +64,172 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -EnumTest = Schema + + +class EnumTest( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'enum_string_required', + )) + + + class enum_string( + _SchemaEnumMaker( + enum_value_to_name={ + "UPPER": "UPPER", + "lower": "LOWER", + "": "EMPTY", + } + ), + StrSchema + ): + + @classmethod + @property + def UPPER(cls): + return cls("UPPER") + + @classmethod + @property + def LOWER(cls): + return cls("lower") + + @classmethod + @property + def EMPTY(cls): + return cls("") + + + class enum_string_required( + _SchemaEnumMaker( + enum_value_to_name={ + "UPPER": "UPPER", + "lower": "LOWER", + "": "EMPTY", + } + ), + StrSchema + ): + + @classmethod + @property + def UPPER(cls): + return cls("UPPER") + + @classmethod + @property + def LOWER(cls): + return cls("lower") + + @classmethod + @property + def EMPTY(cls): + return cls("") + + + class enum_integer( + _SchemaEnumMaker( + enum_value_to_name={ + 1: "POSITIVE_1", + -1: "NEGATIVE_1", + } + ), + Int32Schema + ): + + @classmethod + @property + def POSITIVE_1(cls): + return cls(1) + + @classmethod + @property + def NEGATIVE_1(cls): + return cls(-1) + + + class enum_number( + _SchemaEnumMaker( + enum_value_to_name={ + 1.1: "POSITIVE_1_PT_1", + -1.2: "NEGATIVE_1_PT_2", + } + ), + Float64Schema + ): + + @classmethod + @property + def POSITIVE_1_PT_1(cls): + return cls(1.1) + + @classmethod + @property + def NEGATIVE_1_PT_2(cls): + return cls(-1.2) + + @classmethod + @property + def stringEnum(cls) -> typing.Type['StringEnum']: + return StringEnum + + @classmethod + @property + def IntegerEnum(cls) -> typing.Type['IntegerEnum']: + return IntegerEnum + + @classmethod + @property + def StringEnumWithDefaultValue(cls) -> typing.Type['StringEnumWithDefaultValue']: + return StringEnumWithDefaultValue + + @classmethod + @property + def IntegerEnumWithDefaultValue(cls) -> typing.Type['IntegerEnumWithDefaultValue']: + return IntegerEnumWithDefaultValue + + @classmethod + @property + def IntegerEnumOneValue(cls) -> typing.Type['IntegerEnumOneValue']: + return IntegerEnumOneValue + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + enum_string_required: enum_string_required, + enum_string: typing.Union[enum_string, Unset] = unset, + enum_integer: typing.Union[enum_integer, Unset] = unset, + enum_number: typing.Union[enum_number, Unset] = unset, + stringEnum: typing.Union['StringEnum', Unset] = unset, + IntegerEnum: typing.Union['IntegerEnum', Unset] = unset, + StringEnumWithDefaultValue: typing.Union['StringEnumWithDefaultValue', Unset] = unset, + IntegerEnumWithDefaultValue: typing.Union['IntegerEnumWithDefaultValue', Unset] = unset, + IntegerEnumOneValue: typing.Union['IntegerEnumOneValue', Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'EnumTest': + return super().__new__( + cls, + *args, + enum_string_required=enum_string_required, + enum_string=enum_string, + enum_integer=enum_integer, + enum_number=enum_number, + stringEnum=stringEnum, + IntegerEnum=IntegerEnum, + StringEnumWithDefaultValue=StringEnumWithDefaultValue, + IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue, + IntegerEnumOneValue=IntegerEnumOneValue, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.integer_enum import IntegerEnum from petstore_api.model.integer_enum_one_value import IntegerEnumOneValue diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py index 90bb996d81a3..82a9ae642782 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/equilateral_triangle.py @@ -86,7 +86,42 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + + + class triangleType( + _SchemaEnumMaker( + enum_value_to_name={ + "EquilateralTriangle": "EQUILATERALTRIANGLE", + } + ), + StrSchema + ): + + @classmethod + @property + def EQUILATERALTRIANGLE(cls): + return cls("EquilateralTriangle") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + triangleType: typing.Union[triangleType, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + triangleType=triangleType, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ TriangleInterface, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py index 6798a27bf4e0..0d39c45d8e5b 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file.py @@ -64,4 +64,32 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -File = Schema + + +class File( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Must be named `File` for test. + """ + sourceURI = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + sourceURI: typing.Union[sourceURI, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'File': + return super().__new__( + cls, + *args, + sourceURI=sourceURI, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py index 04e72b09c984..659e0a552c04 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/file_schema_test_class.py @@ -64,6 +64,48 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -FileSchemaTestClass = Schema + + +class FileSchemaTestClass( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + @classmethod + @property + def file(cls) -> typing.Type['File']: + return File + + + class files( + ListSchema + ): + + @classmethod + @property + def _items(cls) -> typing.Type['File']: + return File + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + file: typing.Union['File', Unset] = unset, + files: typing.Union[files, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'FileSchemaTestClass': + return super().__new__( + cls, + *args, + file=file, + files=files, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.file import File diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py index d3d0fe474ffe..7a8df9110230 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/foo.py @@ -64,4 +64,30 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Foo = Schema + + +class Foo( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + bar = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + bar: typing.Union[bar, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Foo': + return super().__new__( + cls, + *args, + bar=bar, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py index d96151ab45fc..f9b32e23273f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/format_test.py @@ -64,4 +64,196 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -FormatTest = Schema + + +class FormatTest( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'number', + 'byte', + 'date', + 'password', + )) + + + class integer( + _SchemaValidator( + inclusive_maximum=100, + inclusive_minimum=10, + multiple_of=[2], + ), + IntSchema + ): + pass + int32 = Int32Schema + + + class int32withValidations( + _SchemaValidator( + inclusive_maximum=200, + inclusive_minimum=20, + ), + Int32Schema + ): + pass + int64 = Int64Schema + + + class number( + _SchemaValidator( + inclusive_maximum=543.2, + inclusive_minimum=32.1, + multiple_of=[32.5], + ), + NumberSchema + ): + pass + + + class _float( + _SchemaValidator( + inclusive_maximum=987.6, + inclusive_minimum=54.3, + ), + Float32Schema + ): + pass + locals()['float'] = _float + del locals()['_float'] + float32 = Float32Schema + + + class double( + _SchemaValidator( + inclusive_maximum=123.4, + inclusive_minimum=67.8, + ), + Float64Schema + ): + pass + float64 = Float64Schema + + + class arrayWithUniqueItems( + _SchemaValidator( + unique_items=True, + ), + ListSchema + ): + _items = NumberSchema + + + class string( + _SchemaValidator( + regex=[{ + 'pattern': r'[a-z]', # noqa: E501 + 'flags': ( + re.IGNORECASE + ) + }], + ), + StrSchema + ): + pass + byte = StrSchema + binary = BinarySchema + date = DateSchema + dateTime = DateTimeSchema + uuid = UUIDSchema + uuidNoExample = UUIDSchema + + + class password( + _SchemaValidator( + max_length=64, + min_length=10, + ), + StrSchema + ): + pass + + + class pattern_with_digits( + _SchemaValidator( + regex=[{ + 'pattern': r'^\d{10}$', # noqa: E501 + }], + ), + StrSchema + ): + pass + + + class pattern_with_digits_and_delimiter( + _SchemaValidator( + regex=[{ + 'pattern': r'^image_\d{1,3}$', # noqa: E501 + 'flags': ( + re.IGNORECASE + ) + }], + ), + StrSchema + ): + pass + noneProp = NoneSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + number: number, + byte: byte, + date: date, + password: password, + integer: typing.Union[integer, Unset] = unset, + int32: typing.Union[int32, Unset] = unset, + int32withValidations: typing.Union[int32withValidations, Unset] = unset, + int64: typing.Union[int64, Unset] = unset, + float32: typing.Union[float32, Unset] = unset, + double: typing.Union[double, Unset] = unset, + float64: typing.Union[float64, Unset] = unset, + arrayWithUniqueItems: typing.Union[arrayWithUniqueItems, Unset] = unset, + string: typing.Union[string, Unset] = unset, + binary: typing.Union[binary, Unset] = unset, + dateTime: typing.Union[dateTime, Unset] = unset, + uuid: typing.Union[uuid, Unset] = unset, + uuidNoExample: typing.Union[uuidNoExample, Unset] = unset, + pattern_with_digits: typing.Union[pattern_with_digits, Unset] = unset, + pattern_with_digits_and_delimiter: typing.Union[pattern_with_digits_and_delimiter, Unset] = unset, + noneProp: typing.Union[noneProp, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'FormatTest': + return super().__new__( + cls, + *args, + number=number, + byte=byte, + date=date, + password=password, + integer=integer, + int32=int32, + int32withValidations=int32withValidations, + int64=int64, + float32=float32, + double=double, + float64=float64, + arrayWithUniqueItems=arrayWithUniqueItems, + string=string, + binary=binary, + dateTime=dateTime, + uuid=uuid, + uuidNoExample=uuidNoExample, + pattern_with_digits=pattern_with_digits, + pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter, + noneProp=noneProp, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py index 4eb8545c71d2..6d8f255c5b0a 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/fruit.py @@ -67,13 +67,14 @@ class Fruit( - ComposedBase, + ComposedSchema ): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech Do not edit the class manually. """ + color = StrSchema @classmethod @property @@ -101,7 +102,7 @@ def _composed_schemas(cls): def __new__( cls, - *args: typing.Union[], + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], color: typing.Union[color, Unset] = unset, _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py index ba543f7ab52f..f591a7ff3ee7 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/gm_fruit.py @@ -67,13 +67,14 @@ class GmFruit( - ComposedBase, + ComposedSchema ): """NOTE: This class is auto generated by OpenAPI Generator. Ref: https://openapi-generator.tech Do not edit the class manually. """ + color = StrSchema @classmethod @property @@ -101,7 +102,7 @@ def _composed_schemas(cls): def __new__( cls, - *args: typing.Union[], + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], color: typing.Union[color, Unset] = unset, _configuration: typing.Optional[Configuration] = None, **kwargs: typing.Type[Schema], diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py index c9ab7f0d0379..a8b0106897f0 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/grandparent_animal.py @@ -64,7 +64,46 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -GrandparentAnimal = Schema + + +class GrandparentAnimal( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'pet_type', + )) + pet_type = StrSchema + + @classmethod + @property + def _discriminator(cls): + return { + 'pet_type': { + 'ChildCat': ChildCat, + 'ParentPet': ParentPet, + } + } + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + pet_type: pet_type, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'GrandparentAnimal': + return super().__new__( + cls, + *args, + pet_type=pet_type, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.child_cat import ChildCat from petstore_api.model.parent_pet import ParentPet diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py index 7605adb1ca8b..ca6317b2457e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/has_only_read_only.py @@ -64,4 +64,33 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -HasOnlyReadOnly = Schema + + +class HasOnlyReadOnly( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + bar = StrSchema + foo = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + bar: typing.Union[bar, Unset] = unset, + foo: typing.Union[foo, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'HasOnlyReadOnly': + return super().__new__( + cls, + *args, + bar=bar, + foo=foo, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py index e9369ce6345a..7f67db6e2318 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/health_check_result.py @@ -64,4 +64,50 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -HealthCheckResult = Schema + + +class HealthCheckResult( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model. + """ + + + class NullableMessage( + _SchemaTypeChecker(typing.Union[none_type, str, ]), + StrBase, + NoneBase, + Schema + ): + + def __new__( + cls, + *args: typing.Union[str, None, ], + _configuration: typing.Optional[Configuration] = None, + ) -> 'NullableMessage': + return super().__new__( + cls, + *args, + _configuration=_configuration, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + NullableMessage: typing.Union[NullableMessage, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'HealthCheckResult': + return super().__new__( + cls, + *args, + NullableMessage=NullableMessage, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py index 4059984eea0b..178878c06d63 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/isosceles_triangle.py @@ -86,7 +86,42 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + + + class triangleType( + _SchemaEnumMaker( + enum_value_to_name={ + "IsoscelesTriangle": "ISOSCELESTRIANGLE", + } + ), + StrSchema + ): + + @classmethod + @property + def ISOSCELESTRIANGLE(cls): + return cls("IsoscelesTriangle") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + triangleType: typing.Union[triangleType, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + triangleType=triangleType, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ TriangleInterface, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py index e2e7ae329f0e..68ff2efbf01d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/map_test.py @@ -64,6 +64,141 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -MapTest = Schema + + +class MapTest( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class map_map_of_string( + DictSchema + ): + + + class _additional_properties( + DictSchema + ): + _additional_properties = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> '_additional_properties': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map_map_of_string': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + class map_of_enum_string( + DictSchema + ): + + + class _additional_properties( + _SchemaEnumMaker( + enum_value_to_name={ + "UPPER": "UPPER", + "lower": "LOWER", + } + ), + StrSchema + ): + + @classmethod + @property + def UPPER(cls): + return cls("UPPER") + + @classmethod + @property + def LOWER(cls): + return cls("lower") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map_of_enum_string': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + class direct_map( + DictSchema + ): + _additional_properties = BoolSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'direct_map': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + @classmethod + @property + def indirect_map(cls) -> typing.Type['StringBooleanMap']: + return StringBooleanMap + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + map_map_of_string: typing.Union[map_map_of_string, Unset] = unset, + map_of_enum_string: typing.Union[map_of_enum_string, Unset] = unset, + direct_map: typing.Union[direct_map, Unset] = unset, + indirect_map: typing.Union['StringBooleanMap', Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'MapTest': + return super().__new__( + cls, + *args, + map_map_of_string=map_map_of_string, + map_of_enum_string=map_of_enum_string, + direct_map=direct_map, + indirect_map=indirect_map, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.string_boolean_map import StringBooleanMap diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py index 97c6d2341ddb..8ed67fef179c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/mixed_properties_and_additional_properties_class.py @@ -64,6 +64,61 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -MixedPropertiesAndAdditionalPropertiesClass = Schema + + +class MixedPropertiesAndAdditionalPropertiesClass( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + uuid = UUIDSchema + dateTime = DateTimeSchema + + + class map( + DictSchema + ): + + @classmethod + @property + def _additional_properties(cls) -> typing.Type['Animal']: + return Animal + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'map': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + uuid: typing.Union[uuid, Unset] = unset, + dateTime: typing.Union[dateTime, Unset] = unset, + map: typing.Union[map, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'MixedPropertiesAndAdditionalPropertiesClass': + return super().__new__( + cls, + *args, + uuid=uuid, + dateTime=dateTime, + map=map, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.animal import Animal diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py index b6585e040af7..8d1c230153e6 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model200_response.py @@ -64,4 +64,34 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Model200Response = Schema + + +class Model200Response( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + model with an invalid class name for python, starts with a number + """ + name = Int32Schema + _class = StrSchema + locals()['class'] = _class + del locals()['_class'] + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + name: typing.Union[name, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Model200Response': + return super().__new__( + cls, + *args, + name=name, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py index 966c2115c760..f963afda001f 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/model_return.py @@ -64,4 +64,31 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ModelReturn = Schema + + +class ModelReturn( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Model for testing reserved words + """ + _return = Int32Schema + locals()['return'] = _return + del locals()['_return'] + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ModelReturn': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py index f6f7cf5cc83a..1569585e7a86 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/money.py @@ -64,6 +64,43 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Money = Schema + + +class Money( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'amount', + 'currency', + )) + amount = DecimalSchema + + @classmethod + @property + def currency(cls) -> typing.Type['Currency']: + return Currency + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + amount: amount, + currency: currency, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Money': + return super().__new__( + cls, + *args, + amount=amount, + currency=currency, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.currency import Currency diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py index 6ed0bdaeb249..1fcc02437f5d 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/name.py @@ -64,4 +64,40 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Name = Schema + + +class Name( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Model for testing model name same as property name + """ + _required_property_names = set(( + 'name', + )) + name = Int32Schema + snake_case = Int32Schema + _property = StrSchema + locals()['property'] = _property + del locals()['_property'] + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + name: name, + snake_case: typing.Union[snake_case, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Name': + return super().__new__( + cls, + *args, + name=name, + snake_case=snake_case, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py index f8b24a5dd8c9..0ea307c5ce9e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/no_additional_properties.py @@ -64,4 +64,35 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -NoAdditionalProperties = Schema + + +class NoAdditionalProperties( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'id', + )) + id = Int64Schema + petId = Int64Schema + _additional_properties = None + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + id: id, + petId: typing.Union[petId, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + ) -> 'NoAdditionalProperties': + return super().__new__( + cls, + *args, + id=id, + petId=petId, + _configuration=_configuration, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py index 39d876fc70d7..9f5613e28d04 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/number_only.py @@ -64,4 +64,30 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -NumberOnly = Schema + + +class NumberOnly( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + JustNumber = NumberSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + JustNumber: typing.Union[JustNumber, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'NumberOnly': + return super().__new__( + cls, + *args, + JustNumber=JustNumber, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py index ecd974eefc49..148779aa9885 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_model_with_ref_props.py @@ -64,6 +64,44 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ObjectModelWithRefProps = Schema + + +class ObjectModelWithRefProps( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations + """ + + @classmethod + @property + def myNumber(cls) -> typing.Type['NumberWithValidations']: + return NumberWithValidations + myString = StrSchema + myBoolean = BoolSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + myNumber: typing.Union['NumberWithValidations', Unset] = unset, + myString: typing.Union[myString, Unset] = unset, + myBoolean: typing.Union[myBoolean, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ObjectModelWithRefProps': + return super().__new__( + cls, + *args, + myNumber=myNumber, + myString=myString, + myBoolean=myBoolean, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.number_with_validations import NumberWithValidations diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py index 517cf55620cf..d19b61f8d689 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_decimal_properties.py @@ -64,6 +64,42 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ObjectWithDecimalProperties = Schema + + +class ObjectWithDecimalProperties( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + length = DecimalSchema + width = DecimalSchema + + @classmethod + @property + def cost(cls) -> typing.Type['Money']: + return Money + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + length: typing.Union[length, Unset] = unset, + width: typing.Union[width, Unset] = unset, + cost: typing.Union['Money', Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ObjectWithDecimalProperties': + return super().__new__( + cls, + *args, + length=length, + width=width, + cost=cost, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.money import Money diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py index faee70f1d3c3..a657bead0601 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_difficultly_named_props.py @@ -64,4 +64,41 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ObjectWithDifficultlyNamedProps = Schema + + +class ObjectWithDifficultlyNamedProps( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + model with properties that have invalid names for python + """ + _required_property_names = set(( + '123-list', + )) + special_property_name = Int64Schema + locals()['$special[property.name]'] = special_property_name + del locals()['special_property_name'] + _123_list = StrSchema + locals()['123-list'] = _123_list + del locals()['_123_list'] + _123_number = IntSchema + locals()['123Number'] = _123_number + del locals()['_123_number'] + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ObjectWithDifficultlyNamedProps': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py index b63790317d91..4b0017d3af4c 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/object_with_inline_composition_property.py @@ -64,4 +64,79 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ObjectWithInlineCompositionProperty = Schema + + +class ObjectWithInlineCompositionProperty( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + + class someProp( + ComposedSchema + ): + + @classmethod + @property + @functools.cache + def _composed_schemas(cls): + # we need this here to make our import statements work + # we must store _composed_schemas in here so the code is only run + # when we invoke this method. If we kept this at the class + # level we would get an error because the class level + # code would be run when this module is imported, and these composed + # classes don't exist yet because their module has not finished + # loading + + + class allOf_0( + _SchemaValidator( + min_length=1, + ), + StrSchema + ): + pass + return { + 'allOf': [ + allOf_0, + ], + 'oneOf': [ + ], + 'anyOf': [ + ], + 'not': + None + } + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'someProp': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + someProp: typing.Union[someProp, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ObjectWithInlineCompositionProperty': + return super().__new__( + cls, + *args, + someProp=someProp, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py index 05cd1ca5a6e9..6c2ec31a9376 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/order.py @@ -64,4 +64,71 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Order = Schema + + +class Order( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + id = Int64Schema + petId = Int64Schema + quantity = Int32Schema + shipDate = DateTimeSchema + + + class status( + _SchemaEnumMaker( + enum_value_to_name={ + "placed": "PLACED", + "approved": "APPROVED", + "delivered": "DELIVERED", + } + ), + StrSchema + ): + + @classmethod + @property + def PLACED(cls): + return cls("placed") + + @classmethod + @property + def APPROVED(cls): + return cls("approved") + + @classmethod + @property + def DELIVERED(cls): + return cls("delivered") + complete = BoolSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + id: typing.Union[id, Unset] = unset, + petId: typing.Union[petId, Unset] = unset, + quantity: typing.Union[quantity, Unset] = unset, + shipDate: typing.Union[shipDate, Unset] = unset, + status: typing.Union[status, Unset] = unset, + complete: typing.Union[complete, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Order': + return super().__new__( + cls, + *args, + id=id, + petId=petId, + quantity=quantity, + shipDate=shipDate, + status=status, + complete=complete, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py index cdfcf4b771bf..18a2feaf8012 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/pet.py @@ -64,7 +64,98 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Pet = Schema + + +class Pet( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Pet object that needs to be added to the store + """ + _required_property_names = set(( + 'name', + 'photoUrls', + )) + id = Int64Schema + + @classmethod + @property + def category(cls) -> typing.Type['Category']: + return Category + name = StrSchema + + + class photoUrls( + ListSchema + ): + _items = StrSchema + + + class tags( + ListSchema + ): + + @classmethod + @property + def _items(cls) -> typing.Type['Tag']: + return Tag + + + class status( + _SchemaEnumMaker( + enum_value_to_name={ + "available": "AVAILABLE", + "pending": "PENDING", + "sold": "SOLD", + } + ), + StrSchema + ): + + @classmethod + @property + def AVAILABLE(cls): + return cls("available") + + @classmethod + @property + def PENDING(cls): + return cls("pending") + + @classmethod + @property + def SOLD(cls): + return cls("sold") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + name: name, + photoUrls: photoUrls, + id: typing.Union[id, Unset] = unset, + category: typing.Union['Category', Unset] = unset, + tags: typing.Union[tags, Unset] = unset, + status: typing.Union[status, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Pet': + return super().__new__( + cls, + *args, + name=name, + photoUrls=photoUrls, + id=id, + category=category, + tags=tags, + status=status, + _configuration=_configuration, + **kwargs, + ) from petstore_api.model.category import Category from petstore_api.model.tag import Tag diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py index 99130a6d2226..d4b2cb288cf5 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/player.py @@ -64,4 +64,39 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Player = Schema + + +class Player( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + a model that includes a self reference this forces properties and additionalProperties to be lazy loaded in python models because the Player class has not fully loaded when defining properties + """ + name = StrSchema + + @classmethod + @property + def enemyPlayer(cls) -> typing.Type['Player']: + return Player + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + name: typing.Union[name, Unset] = unset, + enemyPlayer: typing.Union['Player', Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Player': + return super().__new__( + cls, + *args, + name=name, + enemyPlayer=enemyPlayer, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py index 9a3b3b2238e6..70c2ce8b0601 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/quadrilateral_interface.py @@ -64,4 +64,50 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -QuadrilateralInterface = Schema + + +class QuadrilateralInterface( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'shapeType', + 'quadrilateralType', + )) + + + class shapeType( + _SchemaEnumMaker( + enum_value_to_name={ + "Quadrilateral": "QUADRILATERAL", + } + ), + StrSchema + ): + + @classmethod + @property + def QUADRILATERAL(cls): + return cls("Quadrilateral") + quadrilateralType = StrSchema + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + shapeType: shapeType, + quadrilateralType: quadrilateralType, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'QuadrilateralInterface': + return super().__new__( + cls, + *args, + shapeType=shapeType, + quadrilateralType=quadrilateralType, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py index f47d6030469d..0896f3db9c94 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/read_only_first.py @@ -64,4 +64,33 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -ReadOnlyFirst = Schema + + +class ReadOnlyFirst( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + bar = StrSchema + baz = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + bar: typing.Union[bar, Unset] = unset, + baz: typing.Union[baz, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'ReadOnlyFirst': + return super().__new__( + cls, + *args, + bar=bar, + baz=baz, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py index e249c9d3c6ce..cd193e90d849 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/scalene_triangle.py @@ -86,7 +86,42 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + + + class triangleType( + _SchemaEnumMaker( + enum_value_to_name={ + "ScaleneTriangle": "SCALENETRIANGLE", + } + ), + StrSchema + ): + + @classmethod + @property + def SCALENETRIANGLE(cls): + return cls("ScaleneTriangle") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + triangleType: typing.Union[triangleType, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + triangleType=triangleType, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ TriangleInterface, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py index e03515d6717b..3e375e3f562e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/simple_quadrilateral.py @@ -86,7 +86,42 @@ def _composed_schemas(cls): # code would be run when this module is imported, and these composed # classes don't exist yet because their module has not finished # loading - allOf_1 = Schema + + + class allOf_1( + DictSchema + ): + + + class quadrilateralType( + _SchemaEnumMaker( + enum_value_to_name={ + "SimpleQuadrilateral": "SIMPLEQUADRILATERAL", + } + ), + StrSchema + ): + + @classmethod + @property + def SIMPLEQUADRILATERAL(cls): + return cls("SimpleQuadrilateral") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + quadrilateralType: typing.Union[quadrilateralType, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'allOf_1': + return super().__new__( + cls, + *args, + quadrilateralType=quadrilateralType, + _configuration=_configuration, + **kwargs, + ) return { 'allOf': [ QuadrilateralInterface, diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py index 91bf28ef68ee..5325437bd127 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/special_model_name.py @@ -64,4 +64,32 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -SpecialModelName = Schema + + +class SpecialModelName( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + model with an invalid class name for python + """ + a = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + a: typing.Union[a, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'SpecialModelName': + return super().__new__( + cls, + *args, + a=a, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py index 5d5f5690e1dd..6d166baafafa 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/tag.py @@ -64,4 +64,33 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Tag = Schema + + +class Tag( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + id = Int64Schema + name = StrSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + id: typing.Union[id, Unset] = unset, + name: typing.Union[name, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Tag': + return super().__new__( + cls, + *args, + id=id, + name=name, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py index c5a9f99925f7..f0241962c07e 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/triangle_interface.py @@ -64,4 +64,50 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -TriangleInterface = Schema + + +class TriangleInterface( + AnyTypeSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'shapeType', + 'triangleType', + )) + + + class shapeType( + _SchemaEnumMaker( + enum_value_to_name={ + "Triangle": "TRIANGLE", + } + ), + StrSchema + ): + + @classmethod + @property + def TRIANGLE(cls): + return cls("Triangle") + triangleType = StrSchema + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + shapeType: shapeType, + triangleType: triangleType, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'TriangleInterface': + return super().__new__( + cls, + *args, + shapeType=shapeType, + triangleType=triangleType, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py index 9f6257a45cba..bf1320556ac2 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/user.py @@ -64,4 +64,126 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -User = Schema + + +class User( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + id = Int64Schema + username = StrSchema + firstName = StrSchema + lastName = StrSchema + email = StrSchema + password = StrSchema + phone = StrSchema + userStatus = Int32Schema + objectWithNoDeclaredProps = DictSchema + + + class objectWithNoDeclaredPropsNullable( + _SchemaTypeChecker(typing.Union[frozendict, none_type, ]), + DictBase, + NoneBase, + Schema + ): + + def __new__( + cls, + *args: typing.Union[dict, frozendict, None, ], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'objectWithNoDeclaredPropsNullable': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + anyTypeProp = AnyTypeSchema + + + class anyTypeExceptNullProp( + ComposedSchema + ): + + @classmethod + @property + @functools.cache + def _composed_schemas(cls): + # we need this here to make our import statements work + # we must store _composed_schemas in here so the code is only run + # when we invoke this method. If we kept this at the class + # level we would get an error because the class level + # code would be run when this module is imported, and these composed + # classes don't exist yet because their module has not finished + # loading + NotSchema = NoneSchema + return { + 'allOf': [ + ], + 'oneOf': [ + ], + 'anyOf': [ + ], + 'not': + NotSchema + } + + def __new__( + cls, + *args: typing.Union[dict, frozendict, str, date, datetime, int, float, decimal.Decimal, None, list, tuple, bytes], + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'anyTypeExceptNullProp': + return super().__new__( + cls, + *args, + _configuration=_configuration, + **kwargs, + ) + anyTypePropNullable = AnyTypeSchema + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + id: typing.Union[id, Unset] = unset, + username: typing.Union[username, Unset] = unset, + firstName: typing.Union[firstName, Unset] = unset, + lastName: typing.Union[lastName, Unset] = unset, + email: typing.Union[email, Unset] = unset, + password: typing.Union[password, Unset] = unset, + phone: typing.Union[phone, Unset] = unset, + userStatus: typing.Union[userStatus, Unset] = unset, + objectWithNoDeclaredProps: typing.Union[objectWithNoDeclaredProps, Unset] = unset, + objectWithNoDeclaredPropsNullable: typing.Union[objectWithNoDeclaredPropsNullable, Unset] = unset, + anyTypeProp: typing.Union[anyTypeProp, Unset] = unset, + anyTypeExceptNullProp: typing.Union[anyTypeExceptNullProp, Unset] = unset, + anyTypePropNullable: typing.Union[anyTypePropNullable, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'User': + return super().__new__( + cls, + *args, + id=id, + username=username, + firstName=firstName, + lastName=lastName, + email=email, + password=password, + phone=phone, + userStatus=userStatus, + objectWithNoDeclaredProps=objectWithNoDeclaredProps, + objectWithNoDeclaredPropsNullable=objectWithNoDeclaredPropsNullable, + anyTypeProp=anyTypeProp, + anyTypeExceptNullProp=anyTypeExceptNullProp, + anyTypePropNullable=anyTypePropNullable, + _configuration=_configuration, + **kwargs, + ) diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py index aa4dcee87085..78a28fa763ce 100644 --- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py +++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/whale.py @@ -64,4 +64,53 @@ _SchemaTypeChecker, _SchemaEnumMaker ) -Whale = Schema + + +class Whale( + DictSchema +): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + _required_property_names = set(( + 'className', + )) + hasBaleen = BoolSchema + hasTeeth = BoolSchema + + + class className( + _SchemaEnumMaker( + enum_value_to_name={ + "whale": "WHALE", + } + ), + StrSchema + ): + + @classmethod + @property + def WHALE(cls): + return cls("whale") + + + def __new__( + cls, + *args: typing.Union[dict, frozendict, ], + className: className, + hasBaleen: typing.Union[hasBaleen, Unset] = unset, + hasTeeth: typing.Union[hasTeeth, Unset] = unset, + _configuration: typing.Optional[Configuration] = None, + **kwargs: typing.Type[Schema], + ) -> 'Whale': + return super().__new__( + cls, + *args, + className=className, + hasBaleen=hasBaleen, + hasTeeth=hasTeeth, + _configuration=_configuration, + **kwargs, + ) From 7328ebc619d67d4a409804ab92bc666864346f1a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 11:09:21 -0700 Subject: [PATCH 3/9] Samples regenerated --- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../typescript-aurelia/default/PetApi.ts | 2 +- .../typescript-axios/builds/default/api.ts | 16 ++-- .../typescript-axios/builds/es6-target/api.ts | 16 ++-- .../builds/test-petstore/api.ts | 74 +++++++++---------- .../builds/with-complex-headers/api.ts | 16 ++-- .../api.ts | 74 +++++++++---------- .../builds/with-interfaces/api.ts | 20 ++--- .../builds/with-node-imports/api.ts | 16 ++-- .../api/another/level/pet-api.ts | 16 ++-- .../builds/with-npm-version/api.ts | 16 ++-- .../with-single-request-parameters/api.ts | 16 ++-- .../builds/with-string-enums/api.ts | 16 ++-- .../builds/enum/apis/DefaultApi.ts | 22 +----- .../builds/with-interfaces/apis/PetApi.ts | 2 +- .../with-string-enums/apis/DefaultApi.ts | 22 +----- .../typescript-inversify/api/pet.service.ts | 6 +- .../typescript-jquery/default/api/PetApi.ts | 2 +- .../typescript-jquery/npm/api/PetApi.ts | 2 +- .../builds/default/api/pet.service.ts | 4 +- .../typescript-node/default/api/petApi.ts | 4 +- .../typescript-node/npm/api/petApi.ts | 4 +- .../.openapi-generator/VERSION | 2 +- .../typescript/builds/browser/PetApi.md | 2 +- .../typescript/builds/browser/apis/PetApi.ts | 4 +- .../builds/browser/types/ObjectParamAPI.ts | 4 +- .../builds/browser/types/ObservableAPI.ts | 2 +- .../builds/browser/types/PromiseAPI.ts | 2 +- .../typescript/builds/default/PetApi.md | 2 +- .../typescript/builds/default/apis/PetApi.ts | 4 +- .../builds/default/types/ObjectParamAPI.ts | 4 +- .../builds/default/types/ObservableAPI.ts | 2 +- .../builds/default/types/PromiseAPI.ts | 2 +- .../petstore/typescript/builds/deno/PetApi.md | 2 +- .../typescript/builds/deno/apis/PetApi.ts | 4 +- .../builds/deno/types/ObjectParamAPI.ts | 4 +- .../builds/deno/types/ObservableAPI.ts | 2 +- .../builds/deno/types/PromiseAPI.ts | 2 +- .../typescript/builds/inversify/PetApi.md | 2 +- .../builds/inversify/apis/PetApi.service.ts | 2 +- .../builds/inversify/apis/PetApi.ts | 4 +- .../inversify/services/ObservableAPI.ts | 2 +- .../builds/inversify/services/PromiseAPI.ts | 2 +- .../builds/inversify/types/ObjectParamAPI.ts | 4 +- .../builds/inversify/types/ObservableAPI.ts | 2 +- .../builds/inversify/types/PromiseAPI.ts | 2 +- .../typescript/builds/jquery/PetApi.md | 2 +- .../typescript/builds/jquery/apis/PetApi.ts | 4 +- .../builds/jquery/types/ObjectParamAPI.ts | 4 +- .../builds/jquery/types/ObservableAPI.ts | 2 +- .../builds/jquery/types/PromiseAPI.ts | 2 +- .../typescript/builds/object_params/PetApi.md | 2 +- .../builds/object_params/apis/PetApi.ts | 4 +- .../object_params/types/ObjectParamAPI.ts | 4 +- .../object_params/types/ObservableAPI.ts | 2 +- .../builds/object_params/types/PromiseAPI.ts | 2 +- .../rust-server/output/openapi-v3/README.md | 1 - .../output/openapi-v3/docs/default_api.md | 4 +- .../output/openapi-v3/examples/client/main.rs | 7 +- .../openapi-v3/examples/server/server.rs | 8 +- .../output/openapi-v3/src/client/mod.rs | 8 +- .../rust-server/output/openapi-v3/src/lib.rs | 18 ++--- .../output/openapi-v3/src/server/mod.rs | 27 ++++--- 73 files changed, 296 insertions(+), 323 deletions(-) diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts index 23ec222806fd..ecc1f41b336e 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts @@ -249,10 +249,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts index 23ec222806fd..ecc1f41b336e 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts @@ -249,10 +249,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts index 8d75c4d935bd..5204b71221dc 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts @@ -253,10 +253,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts index 8d75c4d935bd..5204b71221dc 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts @@ -253,10 +253,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts index ee897013335e..233de39bf708 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts index e7a21a8ff1f9..cb164c785991 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-aurelia/default/PetApi.ts b/samples/client/petstore/typescript-aurelia/default/PetApi.ts index 1ac19a00fb88..9184e27acedd 100644 --- a/samples/client/petstore/typescript-aurelia/default/PetApi.ts +++ b/samples/client/petstore/typescript-aurelia/default/PetApi.ts @@ -38,7 +38,7 @@ export interface IDeletePetParams { * findPetsByStatus - parameters interface */ export interface IFindPetsByStatusParams { - status: Array<'available' | 'pending' | 'sold'>; + status: Array; } /** diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index 893802cbed3b..d57f43d87b4a 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index 893802cbed3b..d57f43d87b4a 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts index 572cae522364..0ece51a383dc 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts @@ -2362,18 +2362,18 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters: async (enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { + testEnumParameters: async (enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/fake`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -2404,7 +2404,7 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) } if (enumHeaderStringArray) { - let mapped = enumHeaderStringArray.map(value => ("Array<'>' | '$'>" !== "Array") ? JSON.stringify(value) : (value || "")); + let mapped = enumHeaderStringArray.map(value => ("Array" !== "Array") ? JSON.stringify(value) : (value || "")); localVarHeaderParameter['enum_header_string_array'] = mapped.join(COLLECTION_FORMATS["csv"]); } @@ -2781,18 +2781,18 @@ export const FakeApiFp = function(configuration?: Configuration) { /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -2968,18 +2968,18 @@ export const FakeApiFactory = function (configuration?: Configuration, basePath? /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { + testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { return localVarFp.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(axios, basePath)); }, /** @@ -3170,19 +3170,19 @@ export class FakeApi extends BaseAPI { /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof FakeApi */ - public testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { + public testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { return FakeApiFp(this.configuration).testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(this.axios, this.basePath)); } @@ -3449,11 +3449,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -3806,11 +3806,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -3921,11 +3921,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -4033,12 +4033,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index 8c7d0abac4ab..1c5c5a2ad4be 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -347,11 +347,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -646,11 +646,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -750,11 +750,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -852,12 +852,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts index 011278f1efe2..c89e1a670373 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts @@ -1960,18 +1960,18 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters: async (enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { + testEnumParameters: async (enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/fake`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -2002,7 +2002,7 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) } if (enumHeaderStringArray) { - let mapped = enumHeaderStringArray.map(value => ("Array<'>' | '$'>" !== "Array") ? JSON.stringify(value) : (value || "")); + let mapped = enumHeaderStringArray.map(value => ("Array" !== "Array") ? JSON.stringify(value) : (value || "")); localVarHeaderParameter['enum_header_string_array'] = mapped.join(COLLECTION_FORMATS["csv"]); } @@ -2413,18 +2413,18 @@ export const FakeApiFp = function(configuration?: Configuration) { /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -2602,18 +2602,18 @@ export const FakeApiFactory = function (configuration?: Configuration, basePath? /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { + testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { return localVarFp.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(axios, basePath)); }, /** @@ -2803,19 +2803,19 @@ export class FakeApi extends BaseAPI { /** * To test enum parameters * @summary To test enum parameters - * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) - * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) - * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) - * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) - * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) + * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {string} [enumHeaderString] Header parameter enum test (string) + * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) + * @param {string} [enumQueryString] Query parameter enum test (string) + * @param {number} [enumQueryInteger] Query parameter enum test (double) + * @param {number} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof FakeApi */ - public testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { + public testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { return FakeApiFp(this.configuration).testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(this.axios, this.basePath)); } @@ -3094,11 +3094,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -3451,11 +3451,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -3566,11 +3566,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -3678,12 +3678,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index d808b5aa937b..fb8498709f37 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -830,12 +830,12 @@ export interface PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApiInterface */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): AxiosPromise>; + findPetsByStatus(status: Array, options?: AxiosRequestConfig): AxiosPromise>; /** * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -929,12 +929,12 @@ export class PetApi extends BaseAPI implements PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts index 0cfec1ad4b34..57aab4d54cc1 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts @@ -340,11 +340,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -637,11 +637,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -739,11 +739,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -839,12 +839,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index d84bdc20973a..de680766b3fb 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -116,11 +116,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -413,11 +413,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -515,11 +515,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -615,12 +615,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index 893802cbed3b..d57f43d87b4a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts index 5a06a70cb99e..68dc1c2cfc91 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -843,10 +843,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type {Array<'available' | 'pending' | 'sold'>} + * @type {Array} * @memberof PetApiFindPetsByStatus */ - readonly status: Array<'available' | 'pending' | 'sold'> + readonly status: Array } /** diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts index fd8ae456d7a7..2384cdb32aee 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts @@ -340,11 +340,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -637,11 +637,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -739,11 +739,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { + findPetsByStatus(status: Array, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -839,12 +839,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts index 4ec7bd535b8e..f558a4af5b5b 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts @@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest { } export interface FakeEnumRequestGetRefRequest { - stringEnum?: FakeEnumRequestGetRefStringEnumEnum; + stringEnum?: StringEnum; nullableStringEnum?: StringEnum | null; - numberEnum?: FakeEnumRequestGetRefNumberEnumEnum; + numberEnum?: NumberEnum; nullableNumberEnum?: NumberEnum | null; } @@ -210,21 +210,3 @@ export const FakeEnumRequestGetInlineNumberEnumEnum = { NUMBER_3: 3 } as const; export type FakeEnumRequestGetInlineNumberEnumEnum = typeof FakeEnumRequestGetInlineNumberEnumEnum[keyof typeof FakeEnumRequestGetInlineNumberEnumEnum]; -/** - * @export - */ -export const FakeEnumRequestGetRefStringEnumEnum = { - One: 'one', - Two: 'two', - Three: 'three' -} as const; -export type FakeEnumRequestGetRefStringEnumEnum = typeof FakeEnumRequestGetRefStringEnumEnum[keyof typeof FakeEnumRequestGetRefStringEnumEnum]; -/** - * @export - */ -export const FakeEnumRequestGetRefNumberEnumEnum = { - NUMBER_1: 1, - NUMBER_2: 2, - NUMBER_3: 3 -} as const; -export type FakeEnumRequestGetRefNumberEnumEnum = typeof FakeEnumRequestGetRefNumberEnumEnum[keyof typeof FakeEnumRequestGetRefNumberEnumEnum]; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index ef9f3ddcdbcf..484c1dcf93bb 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -101,7 +101,7 @@ export interface PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter + * @param {Array} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApiInterface diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts index 14d2e8652d3b..a0b27435bf23 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts @@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest { } export interface FakeEnumRequestGetRefRequest { - stringEnum?: FakeEnumRequestGetRefStringEnumEnum; + stringEnum?: StringEnum; nullableStringEnum?: StringEnum | null; - numberEnum?: FakeEnumRequestGetRefNumberEnumEnum; + numberEnum?: NumberEnum; nullableNumberEnum?: NumberEnum | null; } @@ -210,21 +210,3 @@ export enum FakeEnumRequestGetInlineNumberEnumEnum { NUMBER_2 = 2, NUMBER_3 = 3 } -/** - * @export - * @enum {string} - */ -export enum FakeEnumRequestGetRefStringEnumEnum { - One = 'one', - Two = 'two', - Three = 'three' -} -/** - * @export - * @enum {string} - */ -export enum FakeEnumRequestGetRefNumberEnumEnum { - NUMBER_1 = 1, - NUMBER_2 = 2, - NUMBER_3 = 3 -} diff --git a/samples/client/petstore/typescript-inversify/api/pet.service.ts b/samples/client/petstore/typescript-inversify/api/pet.service.ts index 4c9251d993b1..b073fab336cd 100644 --- a/samples/client/petstore/typescript-inversify/api/pet.service.ts +++ b/samples/client/petstore/typescript-inversify/api/pet.service.ts @@ -113,9 +113,9 @@ export class PetService { * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', headers?: Headers): Observable>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', headers?: Headers): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', headers: Headers = {}): Observable { + public findPetsByStatus(status: Array, observe?: 'body', headers?: Headers): Observable>; + public findPetsByStatus(status: Array, observe?: 'response', headers?: Headers): Observable>>; + public findPetsByStatus(status: Array, observe: any = 'body', headers: Headers = {}): Observable { if (status === null || status === undefined){ throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts index 4985ab130743..9bc48fcf83f7 100644 --- a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts +++ b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts @@ -199,7 +199,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< + public findPetsByStatus(status: Array, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< { response: JQueryXHR; body: Array; }, { response: JQueryXHR; errorThrown: string } > { diff --git a/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts b/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts index 4985ab130743..9bc48fcf83f7 100644 --- a/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts +++ b/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts @@ -199,7 +199,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< + public findPetsByStatus(status: Array, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< { response: JQueryXHR; body: Array; }, { response: JQueryXHR; errorThrown: string } > { diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts index 5fa20c944db5..7abeac25bde5 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts @@ -145,8 +145,8 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, ): Observable>>; - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, ): Observable { + public findPetsByStatus(status: Array, ): Observable>>; + public findPetsByStatus(status: Array, ): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts index d518c2b66c8f..ee6f6bdf6611 100644 --- a/samples/client/petstore/typescript-node/default/api/petApi.ts +++ b/samples/client/petstore/typescript-node/default/api/petApi.ts @@ -230,7 +230,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus (status: Array<'available' | 'pending' | 'sold'>, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { + public async findPetsByStatus (status: Array, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -249,7 +249,7 @@ export class PetApi { } if (status !== undefined) { - localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>"); + localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array"); } (Object).assign(localVarHeaderParams, options.headers); diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts index d518c2b66c8f..ee6f6bdf6611 100644 --- a/samples/client/petstore/typescript-node/npm/api/petApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts @@ -230,7 +230,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus (status: Array<'available' | 'pending' | 'sold'>, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { + public async findPetsByStatus (status: Array, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -249,7 +249,7 @@ export class PetApi { } if (status !== undefined) { - localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>"); + localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array"); } (Object).assign(localVarHeaderParams, options.headers); diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION index 717311e32e3c..5f68295fc196 100644 --- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/VERSION @@ -1 +1 @@ -unset \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts index 273352e4f6d9..ea7926384b73 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts index bad3c9fc25ff..d566a951e02c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts index 74f57a7e1c7c..faf4ee89f901 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts index 92d57b673df0..b7ac4145f537 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts index 3dec522f6eea..d5fca7873eb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -116,7 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -134,7 +134,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts index bad3c9fc25ff..d566a951e02c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts index 74f57a7e1c7c..faf4ee89f901 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts index 92d57b673df0..b7ac4145f537 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts index 1e06ca4f61b4..011326ee14b4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts index 02d096f08be4..7d1bbef76f92 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts index f89d38c2f213..5d490820f23a 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts index 46e4a7844050..4ea39a9d558b 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts index e96ab5e14824..c8ae936619e4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts @@ -9,7 +9,7 @@ export abstract class AbstractPetApiRequestFactory { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise; - public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise; + public abstract findPetsByStatus(status: Array, options?: Configuration): Promise; public abstract findPetsByTags(tags: Array, options?: Configuration): Promise; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index cb12d2bdd80e..c4fa646ab031 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -110,7 +110,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -128,7 +128,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts index 014636645ab2..c7e82258ac06 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts @@ -15,7 +15,7 @@ export abstract class AbstractObservablePetApi { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Observable; - public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable>; + public abstract findPetsByStatus(status: Array, options?: Configuration): Observable>; public abstract findPetsByTags(tags: Array, options?: Configuration): Observable>; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts index 121ef651dae2..869300ed159b 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts @@ -14,7 +14,7 @@ export abstract class AbstractPromisePetApi { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise; - public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise>; + public abstract findPetsByStatus(status: Array, options?: Configuration): Promise>; public abstract findPetsByTags(tags: Array, options?: Configuration): Promise>; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts index bad3c9fc25ff..d566a951e02c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts index 678d21b81aab..50e594406dec 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts @@ -85,7 +85,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts index 072f18762816..4b3586af6c77 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts @@ -53,7 +53,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts index 273352e4f6d9..ea7926384b73 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts index bad3c9fc25ff..d566a951e02c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts index 74f57a7e1c7c..faf4ee89f901 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts index 92d57b673df0..b7ac4145f537 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md index 2aac946907bb..090f38c823e1 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter + // Array | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts index 3dec522f6eea..d5fca7873eb2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts @@ -116,7 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -134,7 +134,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts index bad3c9fc25ff..d566a951e02c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<'available' | 'pending' | 'sold'> + * @type Array<string> * @memberof PetApifindPetsByStatus */ - status: Array<'available' | 'pending' | 'sold'> + status: Array } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts index 74f57a7e1c7c..faf4ee89f901 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts index 92d57b673df0..b7ac4145f537 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/server/petstore/rust-server/output/openapi-v3/README.md b/samples/server/petstore/rust-server/output/openapi-v3/README.md index 0348efc3f546..b5bbb27bdf3a 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/README.md +++ b/samples/server/petstore/rust-server/output/openapi-v3/README.md @@ -64,7 +64,6 @@ To run a client, follow one of the following simple steps: cargo run --example client AnyOfGet cargo run --example client CallbackWithHeaderPost cargo run --example client ComplexQueryParamGet -cargo run --example client EnumInPathPathParamGet cargo run --example client JsonComplexQueryParamGet cargo run --example client MandatoryRequestHeaderGet cargo run --example client MergePatchJsonGet diff --git a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md index 9a322a32e71a..192101ead315 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md +++ b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md @@ -127,7 +127,7 @@ No authorization required Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **path_param** | **StringEnum**| | + **path_param** | [****](.md)| | ### Return type @@ -328,7 +328,7 @@ Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **uuid** | [****](.md)| The stuff to get | **some_object** | [****](.md)| Some object to pass as query parameter | - **some_list** | [**i32**](i32.md)| Some list to pass as query parameter | + **some_list** | [****](.md)| Some list to pass as query parameter | ### Return type diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs index b8d8a88b83d9..04b4e28dfde4 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs @@ -56,7 +56,6 @@ fn main() { "AnyOfGet", "CallbackWithHeaderPost", "ComplexQueryParamGet", - "EnumInPathPathParamGet", "JsonComplexQueryParamGet", "MandatoryRequestHeaderGet", "MergePatchJsonGet", @@ -143,12 +142,14 @@ fn main() { )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, + /* Disabled because there's no example. Some("EnumInPathPathParamGet") => { let result = rt.block_on(client.enum_in_path_path_param_get( - "path_param_example".to_string() + ??? )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, + */ Some("JsonComplexQueryParamGet") => { let result = rt.block_on(client.json_complex_query_param_get( Some(&Vec::new()) @@ -190,7 +191,7 @@ fn main() { let result = rt.block_on(client.paramget_get( Some(serde_json::from_str::(r#"38400000-8cf0-11bd-b23e-10b96e4ef00d"#).expect("Failed to parse JSON example")), None, - Some(&Vec::new()) + None )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs index 92ec68736440..e2d19e2266c0 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs @@ -159,11 +159,11 @@ impl Api for Server where C: Has + Send + Sync async fn enum_in_path_path_param_get( &self, - path_param: StringEnum, + path_param: models::StringEnum, context: &C) -> Result { let context = context.clone(); - info!("enum_in_path_path_param_get(\"{}\") - X-Span-ID: {:?}", path_param, context.get().0.clone()); + info!("enum_in_path_path_param_get({:?}) - X-Span-ID: {:?}", path_param, context.get().0.clone()); Err(ApiError("Generic failure".into())) } @@ -237,8 +237,8 @@ impl Api for Server where C: Has + Send + Sync async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option<&MyIdList>, + some_object: Option, + some_list: Option, context: &C) -> Result { let context = context.clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs index 2170e83dd610..3e21905952a8 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs @@ -665,7 +665,7 @@ impl Api for Client where async fn enum_in_path_path_param_get( &self, - param_path_param: StringEnum, + param_path_param: models::StringEnum, context: &C) -> Result { let mut client_service = self.client_service.clone(); @@ -1360,8 +1360,8 @@ impl Api for Client where async fn paramget_get( &self, param_uuid: Option, - param_some_object: Option, - param_some_list: Option<&MyIdList>, + param_some_object: Option, + param_some_list: Option, context: &C) -> Result { let mut client_service = self.client_service.clone(); @@ -1383,7 +1383,7 @@ impl Api for Client where } if let Some(param_some_list) = param_some_list { query_string.append_pair("someList", - ¶m_some_list.iter().map(ToString::to_string).collect::>().join(",")); + ¶m_some_list.to_string()); } query_string.finish() }; diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs index 755587e78fce..61da16cebad3 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs @@ -294,7 +294,7 @@ pub trait Api { async fn enum_in_path_path_param_get( &self, - path_param: StringEnum, + path_param: models::StringEnum, context: &C) -> Result; async fn json_complex_query_param_get( @@ -332,8 +332,8 @@ pub trait Api { async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option<&MyIdList>, + some_object: Option, + some_list: Option, context: &C) -> Result; async fn readonly_auth_scheme_get( @@ -430,7 +430,7 @@ pub trait ApiNoContext { async fn enum_in_path_path_param_get( &self, - path_param: StringEnum, + path_param: models::StringEnum, ) -> Result; async fn json_complex_query_param_get( @@ -468,8 +468,8 @@ pub trait ApiNoContext { async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option<&MyIdList>, + some_object: Option, + some_list: Option, ) -> Result; async fn readonly_auth_scheme_get( @@ -593,7 +593,7 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn enum_in_path_path_param_get( &self, - path_param: StringEnum, + path_param: models::StringEnum, ) -> Result { let context = self.context().clone(); @@ -663,8 +663,8 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option<&MyIdList>, + some_object: Option, + some_list: Option, ) -> Result { let context = self.context().clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs index 6106562f8e0b..813b8d962d02 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs @@ -402,7 +402,7 @@ impl hyper::service::Service<(Request, C)> for Service where ); let param_path_param = match percent_encoding::percent_decode(path_params["path_param"].as_bytes()).decode_utf8() { - Ok(param_path_param) => match param_path_param.parse::() { + Ok(param_path_param) => match param_path_param.parse::() { Ok(param_path_param) => param_path_param, Err(e) => return Ok(Response::builder() .status(StatusCode::BAD_REQUEST) @@ -834,7 +834,7 @@ impl hyper::service::Service<(Request, C)> for Service where let param_some_object = match param_some_object { Some(param_some_object) => { let param_some_object = - ::from_str + ::from_str (¶m_some_object); match param_some_object { Ok(param_some_object) => Some(param_some_object), @@ -847,18 +847,27 @@ impl hyper::service::Service<(Request, C)> for Service where None => None, }; let param_some_list = query_params.iter().filter(|e| e.0 == "someList").map(|e| e.1.to_owned()) - .filter_map(|param_some_list| param_some_list.parse().ok()) - .collect::>(); - let param_some_list = if !param_some_list.is_empty() { - Some(param_some_list) - } else { - None + .nth(0); + let param_some_list = match param_some_list { + Some(param_some_list) => { + let param_some_list = + ::from_str + (¶m_some_list); + match param_some_list { + Ok(param_some_list) => Some(param_some_list), + Err(e) => return Ok(Response::builder() + .status(StatusCode::BAD_REQUEST) + .body(Body::from(format!("Couldn't parse query parameter someList - doesn't match schema: {}", e))) + .expect("Unable to create Bad Request response for invalid query parameter someList")), + } + }, + None => None, }; let result = api_impl.paramget_get( param_uuid, param_some_object, - param_some_list.as_ref(), + param_some_list, &context ).await; let mut response = Response::new(Body::empty()); From 0d8f89f30bc6cd3af2f49c0e4621e72fa3f98dd7 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 11:15:56 -0700 Subject: [PATCH 4/9] Adds parameterModelName setting back in --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 9c7dbfeb41cf..d63b62783db1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4584,6 +4584,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) boolean needToSetSchema = false; if (parameter.getSchema() != null) { parameterSchema = parameter.getSchema(); + parameterModelName = getParameterDataType(parameter, parameterSchema); needToSetSchema = true; } else if (parameter.getContent() != null) { Content content = parameter.getContent(); @@ -4593,6 +4594,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) Map.Entry entry = content.entrySet().iterator().next(); codegenParameter.contentType = entry.getKey(); parameterSchema = entry.getValue().getSchema(); + parameterModelName = getParameterDataType(parameter, parameterSchema); } else { parameterSchema = null; } From 8d6c07756097310646e63396b14666ba9e4cd4f8 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 11:19:22 -0700 Subject: [PATCH 5/9] Samples regenerated --- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/default/api/pet.service.ts | 8 +- .../builds/with-npm/api/pet.service.ts | 8 +- .../typescript-aurelia/default/PetApi.ts | 2 +- .../typescript-axios/builds/default/api.ts | 16 ++-- .../typescript-axios/builds/es6-target/api.ts | 16 ++-- .../builds/test-petstore/api.ts | 74 +++++++++---------- .../builds/with-complex-headers/api.ts | 16 ++-- .../api.ts | 74 +++++++++---------- .../builds/with-interfaces/api.ts | 20 ++--- .../builds/with-node-imports/api.ts | 16 ++-- .../api/another/level/pet-api.ts | 16 ++-- .../builds/with-npm-version/api.ts | 16 ++-- .../with-single-request-parameters/api.ts | 16 ++-- .../builds/with-string-enums/api.ts | 16 ++-- .../builds/with-interfaces/apis/PetApi.ts | 2 +- .../typescript-inversify/api/pet.service.ts | 6 +- .../typescript-jquery/default/api/PetApi.ts | 2 +- .../typescript-jquery/npm/api/PetApi.ts | 2 +- .../builds/default/api/pet.service.ts | 4 +- .../typescript-node/default/api/petApi.ts | 4 +- .../typescript-node/npm/api/petApi.ts | 4 +- .../typescript/builds/browser/PetApi.md | 2 +- .../typescript/builds/browser/apis/PetApi.ts | 4 +- .../builds/browser/types/ObjectParamAPI.ts | 4 +- .../builds/browser/types/ObservableAPI.ts | 2 +- .../builds/browser/types/PromiseAPI.ts | 2 +- .../typescript/builds/default/PetApi.md | 2 +- .../typescript/builds/default/apis/PetApi.ts | 4 +- .../builds/default/types/ObjectParamAPI.ts | 4 +- .../builds/default/types/ObservableAPI.ts | 2 +- .../builds/default/types/PromiseAPI.ts | 2 +- .../petstore/typescript/builds/deno/PetApi.md | 2 +- .../typescript/builds/deno/apis/PetApi.ts | 4 +- .../builds/deno/types/ObjectParamAPI.ts | 4 +- .../builds/deno/types/ObservableAPI.ts | 2 +- .../builds/deno/types/PromiseAPI.ts | 2 +- .../typescript/builds/inversify/PetApi.md | 2 +- .../builds/inversify/apis/PetApi.service.ts | 2 +- .../builds/inversify/apis/PetApi.ts | 4 +- .../inversify/services/ObservableAPI.ts | 2 +- .../builds/inversify/services/PromiseAPI.ts | 2 +- .../builds/inversify/types/ObjectParamAPI.ts | 4 +- .../builds/inversify/types/ObservableAPI.ts | 2 +- .../builds/inversify/types/PromiseAPI.ts | 2 +- .../typescript/builds/jquery/PetApi.md | 2 +- .../typescript/builds/jquery/apis/PetApi.ts | 4 +- .../builds/jquery/types/ObjectParamAPI.ts | 4 +- .../builds/jquery/types/ObservableAPI.ts | 2 +- .../builds/jquery/types/PromiseAPI.ts | 2 +- .../typescript/builds/object_params/PetApi.md | 2 +- .../builds/object_params/apis/PetApi.ts | 4 +- .../object_params/types/ObjectParamAPI.ts | 4 +- .../object_params/types/ObservableAPI.ts | 2 +- .../builds/object_params/types/PromiseAPI.ts | 2 +- .../openapi-v3/examples/server/server.rs | 6 +- .../output/openapi-v3/src/client/mod.rs | 6 +- .../rust-server/output/openapi-v3/src/lib.rs | 18 ++--- .../output/openapi-v3/src/server/mod.rs | 6 +- 67 files changed, 268 insertions(+), 268 deletions(-) diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts index ecc1f41b336e..23ec222806fd 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default/api/pet.service.ts @@ -249,10 +249,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts index ecc1f41b336e..23ec222806fd 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/api/pet.service.ts @@ -249,10 +249,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts index 5204b71221dc..8d75c4d935bd 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default/api/pet.service.ts @@ -253,10 +253,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts index 5204b71221dc..8d75c4d935bd 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/api/pet.service.ts @@ -253,10 +253,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json', context?: HttpContext}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts index 233de39bf708..ee897013335e 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts index cb164c785991..e7a21a8ff1f9 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/api/pet.service.ts @@ -239,10 +239,10 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/xml' | 'application/json',}): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-aurelia/default/PetApi.ts b/samples/client/petstore/typescript-aurelia/default/PetApi.ts index 9184e27acedd..1ac19a00fb88 100644 --- a/samples/client/petstore/typescript-aurelia/default/PetApi.ts +++ b/samples/client/petstore/typescript-aurelia/default/PetApi.ts @@ -38,7 +38,7 @@ export interface IDeletePetParams { * findPetsByStatus - parameters interface */ export interface IFindPetsByStatusParams { - status: Array; + status: Array<'available' | 'pending' | 'sold'>; } /** diff --git a/samples/client/petstore/typescript-axios/builds/default/api.ts b/samples/client/petstore/typescript-axios/builds/default/api.ts index d57f43d87b4a..893802cbed3b 100644 --- a/samples/client/petstore/typescript-axios/builds/default/api.ts +++ b/samples/client/petstore/typescript-axios/builds/default/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts index d57f43d87b4a..893802cbed3b 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-axios/builds/es6-target/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts index 0ece51a383dc..572cae522364 100644 --- a/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts +++ b/samples/client/petstore/typescript-axios/builds/test-petstore/api.ts @@ -2362,18 +2362,18 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters: async (enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { + testEnumParameters: async (enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/fake`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -2404,7 +2404,7 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) } if (enumHeaderStringArray) { - let mapped = enumHeaderStringArray.map(value => ("Array" !== "Array") ? JSON.stringify(value) : (value || "")); + let mapped = enumHeaderStringArray.map(value => ("Array<'>' | '$'>" !== "Array") ? JSON.stringify(value) : (value || "")); localVarHeaderParameter['enum_header_string_array'] = mapped.join(COLLECTION_FORMATS["csv"]); } @@ -2781,18 +2781,18 @@ export const FakeApiFp = function(configuration?: Configuration) { /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -2968,18 +2968,18 @@ export const FakeApiFactory = function (configuration?: Configuration, basePath? /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { + testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { return localVarFp.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(axios, basePath)); }, /** @@ -3170,19 +3170,19 @@ export class FakeApi extends BaseAPI { /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof FakeApi */ - public testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { + public testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { return FakeApiFp(this.configuration).testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(this.axios, this.basePath)); } @@ -3449,11 +3449,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -3806,11 +3806,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -3921,11 +3921,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -4033,12 +4033,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts index 1c5c5a2ad4be..8c7d0abac4ab 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/api.ts @@ -347,11 +347,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -646,11 +646,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -750,11 +750,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -852,12 +852,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts index c89e1a670373..011278f1efe2 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts @@ -1960,18 +1960,18 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters: async (enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { + testEnumParameters: async (enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/fake`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -2002,7 +2002,7 @@ export const FakeApiAxiosParamCreator = function (configuration?: Configuration) } if (enumHeaderStringArray) { - let mapped = enumHeaderStringArray.map(value => ("Array" !== "Array") ? JSON.stringify(value) : (value || "")); + let mapped = enumHeaderStringArray.map(value => ("Array<'>' | '$'>" !== "Array") ? JSON.stringify(value) : (value || "")); localVarHeaderParameter['enum_header_string_array'] = mapped.join(COLLECTION_FORMATS["csv"]); } @@ -2413,18 +2413,18 @@ export const FakeApiFp = function(configuration?: Configuration) { /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + async testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { const localVarAxiosArgs = await localVarAxiosParamCreator.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -2602,18 +2602,18 @@ export const FakeApiFactory = function (configuration?: Configuration, basePath? /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} */ - testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { + testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: any): AxiosPromise { return localVarFp.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(axios, basePath)); }, /** @@ -2803,19 +2803,19 @@ export class FakeApi extends BaseAPI { /** * To test enum parameters * @summary To test enum parameters - * @param {Array} [enumHeaderStringArray] Header parameter enum test (string array) - * @param {string} [enumHeaderString] Header parameter enum test (string) - * @param {Array} [enumQueryStringArray] Query parameter enum test (string array) - * @param {string} [enumQueryString] Query parameter enum test (string) - * @param {number} [enumQueryInteger] Query parameter enum test (double) - * @param {number} [enumQueryDouble] Query parameter enum test (double) + * @param {Array<'>' | '$'>} [enumHeaderStringArray] Header parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumHeaderString] Header parameter enum test (string) + * @param {Array<'>' | '$'>} [enumQueryStringArray] Query parameter enum test (string array) + * @param {'_abc' | '-efg' | '(xyz)'} [enumQueryString] Query parameter enum test (string) + * @param {1 | -2} [enumQueryInteger] Query parameter enum test (double) + * @param {1.1 | -1.2} [enumQueryDouble] Query parameter enum test (double) * @param {Array} [enumFormStringArray] Form parameter enum test (string array) * @param {string} [enumFormString] Form parameter enum test (string) * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof FakeApi */ - public testEnumParameters(enumHeaderStringArray?: Array, enumHeaderString?: string, enumQueryStringArray?: Array, enumQueryString?: string, enumQueryInteger?: number, enumQueryDouble?: number, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { + public testEnumParameters(enumHeaderStringArray?: Array<'>' | '$'>, enumHeaderString?: '_abc' | '-efg' | '(xyz)', enumQueryStringArray?: Array<'>' | '$'>, enumQueryString?: '_abc' | '-efg' | '(xyz)', enumQueryInteger?: 1 | -2, enumQueryDouble?: 1.1 | -1.2, enumFormStringArray?: Array, enumFormString?: string, options?: AxiosRequestConfig) { return FakeApiFp(this.configuration).testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, options).then((request) => request(this.axios, this.basePath)); } @@ -3094,11 +3094,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -3451,11 +3451,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -3566,11 +3566,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -3678,12 +3678,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts index fb8498709f37..d808b5aa937b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -830,12 +830,12 @@ export interface PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApiInterface */ - findPetsByStatus(status: Array, options?: AxiosRequestConfig): AxiosPromise>; + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): AxiosPromise>; /** * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -929,12 +929,12 @@ export class PetApi extends BaseAPI implements PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts index 57aab4d54cc1..0cfec1ad4b34 100644 --- a/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-node-imports/api.ts @@ -340,11 +340,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -637,11 +637,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -739,11 +739,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -839,12 +839,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts index de680766b3fb..d84bdc20973a 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/api/another/level/pet-api.ts @@ -116,11 +116,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -413,11 +413,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -515,11 +515,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -615,12 +615,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts index d57f43d87b4a..893802cbed3b 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -835,12 +835,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts index 68dc1c2cfc91..5a06a70cb99e 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/api.ts @@ -336,11 +336,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -633,11 +633,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -735,11 +735,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -843,10 +843,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type {Array} + * @type {Array<'available' | 'pending' | 'sold'>} * @memberof PetApiFindPetsByStatus */ - readonly status: Array + readonly status: Array<'available' | 'pending' | 'sold'> } /** diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts index 2384cdb32aee..fd8ae456d7a7 100644 --- a/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts +++ b/samples/client/petstore/typescript-axios/builds/with-string-enums/api.ts @@ -340,11 +340,11 @@ export const PetApiAxiosParamCreator = function (configuration?: Configuration) /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus: async (status: Array, options: AxiosRequestConfig = {}): Promise => { + findPetsByStatus: async (status: Array<'available' | 'pending' | 'sold'>, options: AxiosRequestConfig = {}): Promise => { // verify required parameter 'status' is not null or undefined assertParamExists('findPetsByStatus', 'status', status) const localVarPath = `/pet/findByStatus`; @@ -637,11 +637,11 @@ export const PetApiFp = function(configuration?: Configuration) { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async findPetsByStatus(status: Array, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.findPetsByStatus(status, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, @@ -739,11 +739,11 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?: /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} */ - findPetsByStatus(status: Array, options?: any): AxiosPromise> { + findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise> { return localVarFp.findPetsByStatus(status, options).then((request) => request(axios, basePath)); }, /** @@ -839,12 +839,12 @@ export class PetApi extends BaseAPI { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApi */ - public findPetsByStatus(status: Array, options?: AxiosRequestConfig) { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: AxiosRequestConfig) { return PetApiFp(this.configuration).findPetsByStatus(status, options).then((request) => request(this.axios, this.basePath)); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 484c1dcf93bb..ef9f3ddcdbcf 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -101,7 +101,7 @@ export interface PetApiInterface { /** * Multiple status values can be provided with comma separated strings * @summary Finds Pets by status - * @param {Array} status Status values that need to be considered for filter + * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof PetApiInterface diff --git a/samples/client/petstore/typescript-inversify/api/pet.service.ts b/samples/client/petstore/typescript-inversify/api/pet.service.ts index b073fab336cd..4c9251d993b1 100644 --- a/samples/client/petstore/typescript-inversify/api/pet.service.ts +++ b/samples/client/petstore/typescript-inversify/api/pet.service.ts @@ -113,9 +113,9 @@ export class PetService { * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, observe?: 'body', headers?: Headers): Observable>; - public findPetsByStatus(status: Array, observe?: 'response', headers?: Headers): Observable>>; - public findPetsByStatus(status: Array, observe: any = 'body', headers: Headers = {}): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'body', headers?: Headers): Observable>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe?: 'response', headers?: Headers): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, observe: any = 'body', headers: Headers = {}): Observable { if (status === null || status === undefined){ throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); } diff --git a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts index 9bc48fcf83f7..4985ab130743 100644 --- a/samples/client/petstore/typescript-jquery/default/api/PetApi.ts +++ b/samples/client/petstore/typescript-jquery/default/api/PetApi.ts @@ -199,7 +199,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< { response: JQueryXHR; body: Array; }, { response: JQueryXHR; errorThrown: string } > { diff --git a/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts b/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts index 9bc48fcf83f7..4985ab130743 100644 --- a/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts +++ b/samples/client/petstore/typescript-jquery/npm/api/PetApi.ts @@ -199,7 +199,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, extraJQueryAjaxSettings?: JQueryAjaxSettings): JQuery.Promise< { response: JQueryXHR; body: Array; }, { response: JQueryXHR; errorThrown: string } > { diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts index 7abeac25bde5..5fa20c944db5 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api/pet.service.ts @@ -145,8 +145,8 @@ export class PetService { * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param reportProgress flag to report request and response progress. */ - public findPetsByStatus(status: Array, ): Observable>>; - public findPetsByStatus(status: Array, ): Observable { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, ): Observable>>; + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, ): Observable { if (status === null || status === undefined) { throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.'); diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts index ee6f6bdf6611..d518c2b66c8f 100644 --- a/samples/client/petstore/typescript-node/default/api/petApi.ts +++ b/samples/client/petstore/typescript-node/default/api/petApi.ts @@ -230,7 +230,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus (status: Array, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { + public async findPetsByStatus (status: Array<'available' | 'pending' | 'sold'>, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -249,7 +249,7 @@ export class PetApi { } if (status !== undefined) { - localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array"); + localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>"); } (Object).assign(localVarHeaderParams, options.headers); diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts index ee6f6bdf6611..d518c2b66c8f 100644 --- a/samples/client/petstore/typescript-node/npm/api/petApi.ts +++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts @@ -230,7 +230,7 @@ export class PetApi { * @summary Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus (status: Array, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { + public async findPetsByStatus (status: Array<'available' | 'pending' | 'sold'>, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.IncomingMessage; body: Array; }> { const localVarPath = this.basePath + '/pet/findByStatus'; let localVarQueryParameters: any = {}; let localVarHeaderParams: any = (Object).assign({}, this._defaultHeaders); @@ -249,7 +249,7 @@ export class PetApi { } if (status !== undefined) { - localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array"); + localVarQueryParameters['status'] = ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>"); } (Object).assign(localVarHeaderParams, options.headers); diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/browser/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts index ea7926384b73..273352e4f6d9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts index d566a951e02c..bad3c9fc25ff 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts index faf4ee89f901..74f57a7e1c7c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts index b7ac4145f537..92d57b673df0 100644 --- a/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/browser/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/default/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts index d5fca7873eb2..3dec522f6eea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts @@ -116,7 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -134,7 +134,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts index d566a951e02c..bad3c9fc25ff 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts index faf4ee89f901..74f57a7e1c7c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts index b7ac4145f537..92d57b673df0 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/deno/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts index 011326ee14b4..1e06ca4f61b4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts index 7d1bbef76f92..02d096f08be4 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts index 5d490820f23a..f89d38c2f213 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts index 4ea39a9d558b..46e4a7844050 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts index c8ae936619e4..e96ab5e14824 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.service.ts @@ -9,7 +9,7 @@ export abstract class AbstractPetApiRequestFactory { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise; - public abstract findPetsByStatus(status: Array, options?: Configuration): Promise; + public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise; public abstract findPetsByTags(tags: Array, options?: Configuration): Promise; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index c4fa646ab031..cb12d2bdd80e 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -110,7 +110,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -128,7 +128,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts index c7e82258ac06..014636645ab2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/ObservableAPI.ts @@ -15,7 +15,7 @@ export abstract class AbstractObservablePetApi { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Observable; - public abstract findPetsByStatus(status: Array, options?: Configuration): Observable>; + public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Observable>; public abstract findPetsByTags(tags: Array, options?: Configuration): Observable>; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts index 869300ed159b..121ef651dae2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/services/PromiseAPI.ts @@ -14,7 +14,7 @@ export abstract class AbstractPromisePetApi { public abstract deletePet(petId: number, apiKey?: string, options?: Configuration): Promise; - public abstract findPetsByStatus(status: Array, options?: Configuration): Promise>; + public abstract findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: Configuration): Promise>; public abstract findPetsByTags(tags: Array, options?: Configuration): Promise>; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts index d566a951e02c..bad3c9fc25ff 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts index 50e594406dec..678d21b81aab 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/ObservableAPI.ts @@ -85,7 +85,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts index 4b3586af6c77..072f18762816 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/types/PromiseAPI.ts @@ -53,7 +53,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts index ea7926384b73..273352e4f6d9 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/apis/PetApi.ts @@ -114,7 +114,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -132,7 +132,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts index d566a951e02c..bad3c9fc25ff 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts index faf4ee89f901..74f57a7e1c7c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts index b7ac4145f537..92d57b673df0 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md index 090f38c823e1..2aac946907bb 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/PetApi.md @@ -159,7 +159,7 @@ const configuration = petstore.createConfiguration(); const apiInstance = new petstore.PetApi(configuration); let body:petstore.PetApiFindPetsByStatusRequest = { - // Array | Status values that need to be considered for filter + // Array<'available' | 'pending' | 'sold'> | Status values that need to be considered for filter status: [ "available", ], diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts index d5fca7873eb2..3dec522f6eea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/apis/PetApi.ts @@ -116,7 +116,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public async findPetsByStatus(status: Array, _options?: Configuration): Promise { + public async findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise { let _config = _options || this.configuration; // verify required parameter 'status' is not null or undefined @@ -134,7 +134,7 @@ export class PetApiRequestFactory extends BaseAPIRequestFactory { // Query Params if (status !== undefined) { - requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array", "")); + requestContext.setQueryParam("status", ObjectSerializer.serialize(status, "Array<'available' | 'pending' | 'sold'>", "")); } diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts index d566a951e02c..bad3c9fc25ff 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObjectParamAPI.ts @@ -39,10 +39,10 @@ export interface PetApiDeletePetRequest { export interface PetApiFindPetsByStatusRequest { /** * Status values that need to be considered for filter - * @type Array<string> + * @type Array<'available' | 'pending' | 'sold'> * @memberof PetApifindPetsByStatus */ - status: Array + status: Array<'available' | 'pending' | 'sold'> } export interface PetApiFindPetsByTagsRequest { diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts index faf4ee89f901..74f57a7e1c7c 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/ObservableAPI.ts @@ -80,7 +80,7 @@ export class ObservablePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Observable> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Observable> { const requestContextPromise = this.requestFactory.findPetsByStatus(status, _options); // build promise chain diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts index b7ac4145f537..92d57b673df0 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/types/PromiseAPI.ts @@ -48,7 +48,7 @@ export class PromisePetApi { * Finds Pets by status * @param status Status values that need to be considered for filter */ - public findPetsByStatus(status: Array, _options?: Configuration): Promise> { + public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, _options?: Configuration): Promise> { const result = this.api.findPetsByStatus(status, _options); return result.toPromise(); } diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs index e2d19e2266c0..2a9dacecd9bd 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs @@ -159,7 +159,7 @@ impl Api for Server where C: Has + Send + Sync async fn enum_in_path_path_param_get( &self, - path_param: models::StringEnum, + path_param: StringEnum, context: &C) -> Result { let context = context.clone(); @@ -237,8 +237,8 @@ impl Api for Server where C: Has + Send + Sync async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option, + some_object: Option, + some_list: Option, context: &C) -> Result { let context = context.clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs index 3e21905952a8..2bac45193d43 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs @@ -665,7 +665,7 @@ impl Api for Client where async fn enum_in_path_path_param_get( &self, - param_path_param: models::StringEnum, + param_path_param: StringEnum, context: &C) -> Result { let mut client_service = self.client_service.clone(); @@ -1360,8 +1360,8 @@ impl Api for Client where async fn paramget_get( &self, param_uuid: Option, - param_some_object: Option, - param_some_list: Option, + param_some_object: Option, + param_some_list: Option, context: &C) -> Result { let mut client_service = self.client_service.clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs index 61da16cebad3..514c469f5453 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs @@ -294,7 +294,7 @@ pub trait Api { async fn enum_in_path_path_param_get( &self, - path_param: models::StringEnum, + path_param: StringEnum, context: &C) -> Result; async fn json_complex_query_param_get( @@ -332,8 +332,8 @@ pub trait Api { async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option, + some_object: Option, + some_list: Option, context: &C) -> Result; async fn readonly_auth_scheme_get( @@ -430,7 +430,7 @@ pub trait ApiNoContext { async fn enum_in_path_path_param_get( &self, - path_param: models::StringEnum, + path_param: StringEnum, ) -> Result; async fn json_complex_query_param_get( @@ -468,8 +468,8 @@ pub trait ApiNoContext { async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option, + some_object: Option, + some_list: Option, ) -> Result; async fn readonly_auth_scheme_get( @@ -593,7 +593,7 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn enum_in_path_path_param_get( &self, - path_param: models::StringEnum, + path_param: StringEnum, ) -> Result { let context = self.context().clone(); @@ -663,8 +663,8 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn paramget_get( &self, uuid: Option, - some_object: Option, - some_list: Option, + some_object: Option, + some_list: Option, ) -> Result { let context = self.context().clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs index 813b8d962d02..5160f4af5392 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs @@ -402,7 +402,7 @@ impl hyper::service::Service<(Request, C)> for Service where ); let param_path_param = match percent_encoding::percent_decode(path_params["path_param"].as_bytes()).decode_utf8() { - Ok(param_path_param) => match param_path_param.parse::() { + Ok(param_path_param) => match param_path_param.parse::() { Ok(param_path_param) => param_path_param, Err(e) => return Ok(Response::builder() .status(StatusCode::BAD_REQUEST) @@ -834,7 +834,7 @@ impl hyper::service::Service<(Request, C)> for Service where let param_some_object = match param_some_object { Some(param_some_object) => { let param_some_object = - ::from_str + ::from_str (¶m_some_object); match param_some_object { Ok(param_some_object) => Some(param_some_object), @@ -851,7 +851,7 @@ impl hyper::service::Service<(Request, C)> for Service where let param_some_list = match param_some_list { Some(param_some_list) => { let param_some_list = - ::from_str + ::from_str (¶m_some_list); match param_some_list { Ok(param_some_list) => Some(param_some_list), From e1678de3fc873c88147ee4d861e2a58566736e3d Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 11:35:21 -0700 Subject: [PATCH 6/9] removes needToSetSchema --- .../java/org/openapitools/codegen/DefaultCodegen.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index d63b62783db1..1dc49e286aeb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4579,13 +4579,13 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) // the parameter model name is obtained from the schema $ref // e.g. #/components/schemas/list_pageQuery_parameter => toModelName(list_pageQuery_parameter) String parameterModelName = null; - HashMap importMapping = new HashMap<>(); boolean needToSetSchema = false; if (parameter.getSchema() != null) { parameterSchema = parameter.getSchema(); parameterModelName = getParameterDataType(parameter, parameterSchema); - needToSetSchema = true; + CodegenProperty prop = fromProperty(parameter.getName(), unaliasSchema(parameterSchema, Collections.emptyMap())); + codegenParameter.setSchema(prop); } else if (parameter.getContent() != null) { Content content = parameter.getContent(); if (content.size() > 1) { @@ -4627,11 +4627,6 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) return codegenParameter; } - if (needToSetSchema) { - CodegenProperty prop = fromProperty(parameter.getName(), parameterSchema); - codegenParameter.setSchema(prop); - } - ModelUtils.syncValidationProperties(parameterSchema, codegenParameter); codegenParameter.setTypeProperties(parameterSchema); codegenParameter.setComposedSchemas(getComposedSchemas(parameterSchema)); From f065c2dfbe5762afe8a30c740d46deef9e3e13cc Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 11:44:39 -0700 Subject: [PATCH 7/9] Sets schema differently depending on if inline model resolver is used --- .../java/org/openapitools/codegen/DefaultCodegen.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 1dc49e286aeb..47dfb1ac829c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4580,11 +4580,15 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) // e.g. #/components/schemas/list_pageQuery_parameter => toModelName(list_pageQuery_parameter) String parameterModelName = null; - boolean needToSetSchema = false; if (parameter.getSchema() != null) { parameterSchema = parameter.getSchema(); parameterModelName = getParameterDataType(parameter, parameterSchema); - CodegenProperty prop = fromProperty(parameter.getName(), unaliasSchema(parameterSchema, Collections.emptyMap())); + CodegenProperty prop; + if (getUseInlineModelResolver()) { + prop = fromProperty(parameter.getName(), ModelUtils.getReferencedSchema(openAPI, parameterSchema)); + } else { + prop = fromProperty(parameter.getName(), parameterSchema); + } codegenParameter.setSchema(prop); } else if (parameter.getContent() != null) { Content content = parameter.getContent(); From 6539bde41a14eedc1f3d389a97c1265e90ad7906 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 12:22:46 -0700 Subject: [PATCH 8/9] Adds step for getting ref schema --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 47dfb1ac829c..0182b8a803d6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4625,11 +4625,13 @@ public CodegenParameter fromParameter(Parameter parameter, Set imports) parameterSchema = unaliasSchema(parameterSchema, Collections.emptyMap()); if (parameterSchema == null) { - LOGGER.warn("warning! Schema not found for parameter \" {} \", using String", parameter.getName()); - parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition."); + LOGGER.warn("warning! Schema not found for parameter \" {} \"", parameter.getName()); finishUpdatingParameter(codegenParameter, parameter); return codegenParameter; } + if (getUseInlineModelResolver()) { + parameterSchema = ModelUtils.getReferencedSchema(openAPI, parameterSchema); + } ModelUtils.syncValidationProperties(parameterSchema, codegenParameter); codegenParameter.setTypeProperties(parameterSchema); From 4056ded4bb21fd70ff78a0440601d178fc85756a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 18 May 2022 13:59:37 -0700 Subject: [PATCH 9/9] Samples regen --- .../builds/enum/apis/DefaultApi.ts | 22 ++++++++++++++++-- .../with-string-enums/apis/DefaultApi.ts | 22 ++++++++++++++++-- .../rust-server/output/openapi-v3/README.md | 1 + .../output/openapi-v3/docs/default_api.md | 4 ++-- .../output/openapi-v3/examples/client/main.rs | 7 +++--- .../openapi-v3/examples/server/server.rs | 4 ++-- .../output/openapi-v3/src/client/mod.rs | 4 ++-- .../rust-server/output/openapi-v3/src/lib.rs | 6 ++--- .../output/openapi-v3/src/server/mod.rs | 23 ++++++------------- 9 files changed, 60 insertions(+), 33 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts index f558a4af5b5b..4ec7bd535b8e 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts @@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest { } export interface FakeEnumRequestGetRefRequest { - stringEnum?: StringEnum; + stringEnum?: FakeEnumRequestGetRefStringEnumEnum; nullableStringEnum?: StringEnum | null; - numberEnum?: NumberEnum; + numberEnum?: FakeEnumRequestGetRefNumberEnumEnum; nullableNumberEnum?: NumberEnum | null; } @@ -210,3 +210,21 @@ export const FakeEnumRequestGetInlineNumberEnumEnum = { NUMBER_3: 3 } as const; export type FakeEnumRequestGetInlineNumberEnumEnum = typeof FakeEnumRequestGetInlineNumberEnumEnum[keyof typeof FakeEnumRequestGetInlineNumberEnumEnum]; +/** + * @export + */ +export const FakeEnumRequestGetRefStringEnumEnum = { + One: 'one', + Two: 'two', + Three: 'three' +} as const; +export type FakeEnumRequestGetRefStringEnumEnum = typeof FakeEnumRequestGetRefStringEnumEnum[keyof typeof FakeEnumRequestGetRefStringEnumEnum]; +/** + * @export + */ +export const FakeEnumRequestGetRefNumberEnumEnum = { + NUMBER_1: 1, + NUMBER_2: 2, + NUMBER_3: 3 +} as const; +export type FakeEnumRequestGetRefNumberEnumEnum = typeof FakeEnumRequestGetRefNumberEnumEnum[keyof typeof FakeEnumRequestGetRefNumberEnumEnum]; diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts index a0b27435bf23..14d2e8652d3b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts @@ -37,9 +37,9 @@ export interface FakeEnumRequestGetInlineRequest { } export interface FakeEnumRequestGetRefRequest { - stringEnum?: StringEnum; + stringEnum?: FakeEnumRequestGetRefStringEnumEnum; nullableStringEnum?: StringEnum | null; - numberEnum?: NumberEnum; + numberEnum?: FakeEnumRequestGetRefNumberEnumEnum; nullableNumberEnum?: NumberEnum | null; } @@ -210,3 +210,21 @@ export enum FakeEnumRequestGetInlineNumberEnumEnum { NUMBER_2 = 2, NUMBER_3 = 3 } +/** + * @export + * @enum {string} + */ +export enum FakeEnumRequestGetRefStringEnumEnum { + One = 'one', + Two = 'two', + Three = 'three' +} +/** + * @export + * @enum {string} + */ +export enum FakeEnumRequestGetRefNumberEnumEnum { + NUMBER_1 = 1, + NUMBER_2 = 2, + NUMBER_3 = 3 +} diff --git a/samples/server/petstore/rust-server/output/openapi-v3/README.md b/samples/server/petstore/rust-server/output/openapi-v3/README.md index b5bbb27bdf3a..0348efc3f546 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/README.md +++ b/samples/server/petstore/rust-server/output/openapi-v3/README.md @@ -64,6 +64,7 @@ To run a client, follow one of the following simple steps: cargo run --example client AnyOfGet cargo run --example client CallbackWithHeaderPost cargo run --example client ComplexQueryParamGet +cargo run --example client EnumInPathPathParamGet cargo run --example client JsonComplexQueryParamGet cargo run --example client MandatoryRequestHeaderGet cargo run --example client MergePatchJsonGet diff --git a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md index 192101ead315..9a322a32e71a 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md +++ b/samples/server/petstore/rust-server/output/openapi-v3/docs/default_api.md @@ -127,7 +127,7 @@ No authorization required Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **path_param** | [****](.md)| | + **path_param** | **StringEnum**| | ### Return type @@ -328,7 +328,7 @@ Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **uuid** | [****](.md)| The stuff to get | **some_object** | [****](.md)| Some object to pass as query parameter | - **some_list** | [****](.md)| Some list to pass as query parameter | + **some_list** | [**i32**](i32.md)| Some list to pass as query parameter | ### Return type diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs index 04b4e28dfde4..b8d8a88b83d9 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/client/main.rs @@ -56,6 +56,7 @@ fn main() { "AnyOfGet", "CallbackWithHeaderPost", "ComplexQueryParamGet", + "EnumInPathPathParamGet", "JsonComplexQueryParamGet", "MandatoryRequestHeaderGet", "MergePatchJsonGet", @@ -142,14 +143,12 @@ fn main() { )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, - /* Disabled because there's no example. Some("EnumInPathPathParamGet") => { let result = rt.block_on(client.enum_in_path_path_param_get( - ??? + "path_param_example".to_string() )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, - */ Some("JsonComplexQueryParamGet") => { let result = rt.block_on(client.json_complex_query_param_get( Some(&Vec::new()) @@ -191,7 +190,7 @@ fn main() { let result = rt.block_on(client.paramget_get( Some(serde_json::from_str::(r#"38400000-8cf0-11bd-b23e-10b96e4ef00d"#).expect("Failed to parse JSON example")), None, - None + Some(&Vec::new()) )); info!("{:?} (X-Span-ID: {:?})", result, (client.context() as &dyn Has).get().clone()); }, diff --git a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs index 2a9dacecd9bd..92ec68736440 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/examples/server/server.rs @@ -163,7 +163,7 @@ impl Api for Server where C: Has + Send + Sync context: &C) -> Result { let context = context.clone(); - info!("enum_in_path_path_param_get({:?}) - X-Span-ID: {:?}", path_param, context.get().0.clone()); + info!("enum_in_path_path_param_get(\"{}\") - X-Span-ID: {:?}", path_param, context.get().0.clone()); Err(ApiError("Generic failure".into())) } @@ -238,7 +238,7 @@ impl Api for Server where C: Has + Send + Sync &self, uuid: Option, some_object: Option, - some_list: Option, + some_list: Option<&MyIdList>, context: &C) -> Result { let context = context.clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs index 2bac45193d43..2170e83dd610 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/client/mod.rs @@ -1361,7 +1361,7 @@ impl Api for Client where &self, param_uuid: Option, param_some_object: Option, - param_some_list: Option, + param_some_list: Option<&MyIdList>, context: &C) -> Result { let mut client_service = self.client_service.clone(); @@ -1383,7 +1383,7 @@ impl Api for Client where } if let Some(param_some_list) = param_some_list { query_string.append_pair("someList", - ¶m_some_list.to_string()); + ¶m_some_list.iter().map(ToString::to_string).collect::>().join(",")); } query_string.finish() }; diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs index 514c469f5453..755587e78fce 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/lib.rs @@ -333,7 +333,7 @@ pub trait Api { &self, uuid: Option, some_object: Option, - some_list: Option, + some_list: Option<&MyIdList>, context: &C) -> Result; async fn readonly_auth_scheme_get( @@ -469,7 +469,7 @@ pub trait ApiNoContext { &self, uuid: Option, some_object: Option, - some_list: Option, + some_list: Option<&MyIdList>, ) -> Result; async fn readonly_auth_scheme_get( @@ -664,7 +664,7 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex &self, uuid: Option, some_object: Option, - some_list: Option, + some_list: Option<&MyIdList>, ) -> Result { let context = self.context().clone(); diff --git a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs index 5160f4af5392..6106562f8e0b 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/openapi-v3/src/server/mod.rs @@ -847,27 +847,18 @@ impl hyper::service::Service<(Request, C)> for Service where None => None, }; let param_some_list = query_params.iter().filter(|e| e.0 == "someList").map(|e| e.1.to_owned()) - .nth(0); - let param_some_list = match param_some_list { - Some(param_some_list) => { - let param_some_list = - ::from_str - (¶m_some_list); - match param_some_list { - Ok(param_some_list) => Some(param_some_list), - Err(e) => return Ok(Response::builder() - .status(StatusCode::BAD_REQUEST) - .body(Body::from(format!("Couldn't parse query parameter someList - doesn't match schema: {}", e))) - .expect("Unable to create Bad Request response for invalid query parameter someList")), - } - }, - None => None, + .filter_map(|param_some_list| param_some_list.parse().ok()) + .collect::>(); + let param_some_list = if !param_some_list.is_empty() { + Some(param_some_list) + } else { + None }; let result = api_impl.paramget_get( param_uuid, param_some_object, - param_some_list, + param_some_list.as_ref(), &context ).await; let mut response = Response::new(Body::empty());