From ce893a84ff21f6719ecad01fb9e7b1e09346bffb Mon Sep 17 00:00:00 2001 From: Justin Black Date: Fri, 8 Jan 2021 13:15:55 -0800 Subject: [PATCH 01/23] Fixes object serialization when there is an inline array property which contains a refed enum (#8387) * Fixes object inline enum defintion with refed enum item * Adds refed array model example w/ serialization + deserialization --- .../resources/python/model_utils.mustache | 11 +- .../python/PythonLegacyClientCodegenTest.java | 1 - ...odels-for-testing-with-http-signature.yaml | 26 ++++ .../python/petstore_api/model_utils.py | 11 +- .../python/x_auth_id_alias/model_utils.py | 11 +- .../python/dynamic_servers/model_utils.py | 11 +- .../openapi3/client/petstore/python/README.md | 1 + .../client/petstore/python/docs/EnumTest.md | 2 + .../client/petstore/python/docs/FakeApi.md | 79 ++++++++++++ .../python/petstore_api/api/fake_api.py | 112 ++++++++++++++++++ .../python/petstore_api/model/enum_test.py | 8 ++ .../python/petstore_api/model_utils.py | 11 +- .../python/tests_manual/test_enum_test.py | 46 +++++++ .../python/tests_manual/test_fake_api.py | 46 +++++++ 14 files changed, 355 insertions(+), 21 deletions(-) create mode 100644 samples/openapi3/client/petstore/python/tests_manual/test_enum_test.py diff --git a/modules/openapi-generator/src/main/resources/python/model_utils.mustache b/modules/openapi-generator/src/main/resources/python/model_utils.mustache index 9c299d4b3ef7..07b77a99d18c 100644 --- a/modules/openapi-generator/src/main/resources/python/model_utils.mustache +++ b/modules/openapi-generator/src/main/resources/python/model_utils.mustache @@ -1211,10 +1211,13 @@ def model_to_dict(model_instance, serialize=True): # exist in attribute_map attr = model_instance.attribute_map.get(attr, attr) if isinstance(value, list): - result[attr] = list(map( - lambda x: model_to_dict(x, serialize=serialize) - if hasattr(x, '_data_store') else x, value - )) + if not value or isinstance(value[0], PRIMITIVE_TYPES): + # empty list or primitive types + result[attr] = value + elif isinstance(value[0], ModelSimple): + result[attr] = [x.value for x in value] + else: + result[attr] = [model_to_dict(x, serialize=serialize) for x in value] elif isinstance(value, dict): result[attr] = dict(map( lambda item: (item[0], diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java index f7e949e5f27e..45c784f40ed6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonLegacyClientCodegenTest.java @@ -18,7 +18,6 @@ package org.openapitools.codegen.python; import com.google.common.collect.Sets; -import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.*; diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index fa3500df0a1b..41a16b1011bd 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1008,6 +1008,26 @@ paths: application/json: schema: $ref: '#/components/schemas/ArrayOfEnums' + /fake/refs/enum-test: + post: + tags: + - fake + summary: Object contains enum properties and array properties containing enums + operationId: EnumTest + requestBody: + description: Input object + content: + application/json: + schema: + $ref: '#/components/schemas/Enum_Test' + required: false + responses: + 200: + description: Got object containing enums + content: + application/json: + schema: + $ref: '#/components/schemas/Enum_Test' /fake/additional-properties-with-array-of-enums: get: tags: @@ -1671,6 +1691,12 @@ components: $ref: '#/components/schemas/IntegerEnumWithDefaultValue' IntegerEnumOneValue: $ref: '#/components/schemas/IntegerEnumOneValue' + InlineArrayOfStrEnum: + type: array + items: + $ref: '#/components/schemas/StringEnum' + ArrayOfStrEnum: + $ref: '#/components/schemas/ArrayOfEnums' AdditionalPropertiesClass: type: object properties: diff --git a/samples/client/petstore/python/petstore_api/model_utils.py b/samples/client/petstore/python/petstore_api/model_utils.py index 7afcb68f615e..ae5547106703 100644 --- a/samples/client/petstore/python/petstore_api/model_utils.py +++ b/samples/client/petstore/python/petstore_api/model_utils.py @@ -1493,10 +1493,13 @@ def model_to_dict(model_instance, serialize=True): # exist in attribute_map attr = model_instance.attribute_map.get(attr, attr) if isinstance(value, list): - result[attr] = list(map( - lambda x: model_to_dict(x, serialize=serialize) - if hasattr(x, '_data_store') else x, value - )) + if not value or isinstance(value[0], PRIMITIVE_TYPES): + # empty list or primitive types + result[attr] = value + elif isinstance(value[0], ModelSimple): + result[attr] = [x.value for x in value] + else: + result[attr] = [model_to_dict(x, serialize=serialize) for x in value] elif isinstance(value, dict): result[attr] = dict(map( lambda item: (item[0], diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/model_utils.py b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/model_utils.py index 2533abbc7171..3276615fd49a 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/model_utils.py +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/model_utils.py @@ -1493,10 +1493,13 @@ def model_to_dict(model_instance, serialize=True): # exist in attribute_map attr = model_instance.attribute_map.get(attr, attr) if isinstance(value, list): - result[attr] = list(map( - lambda x: model_to_dict(x, serialize=serialize) - if hasattr(x, '_data_store') else x, value - )) + if not value or isinstance(value[0], PRIMITIVE_TYPES): + # empty list or primitive types + result[attr] = value + elif isinstance(value[0], ModelSimple): + result[attr] = [x.value for x in value] + else: + result[attr] = [model_to_dict(x, serialize=serialize) for x in value] elif isinstance(value, dict): result[attr] = dict(map( lambda item: (item[0], diff --git a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/model_utils.py b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/model_utils.py index f0a4962ad538..7edd9487c370 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/model_utils.py +++ b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/model_utils.py @@ -1493,10 +1493,13 @@ def model_to_dict(model_instance, serialize=True): # exist in attribute_map attr = model_instance.attribute_map.get(attr, attr) if isinstance(value, list): - result[attr] = list(map( - lambda x: model_to_dict(x, serialize=serialize) - if hasattr(x, '_data_store') else x, value - )) + if not value or isinstance(value[0], PRIMITIVE_TYPES): + # empty list or primitive types + result[attr] = value + elif isinstance(value[0], ModelSimple): + result[attr] = [x.value for x in value] + else: + result[attr] = [model_to_dict(x, serialize=serialize) for x in value] elif isinstance(value, dict): result[attr] = dict(map( lambda item: (item[0], diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 9f9fb246b272..b7e1090f0344 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -88,6 +88,7 @@ Class | Method | HTTP request | Description *FakeApi* | [**array_of_enums**](docs/FakeApi.md#array_of_enums) | **POST** /fake/refs/array-of-enums | Array of Enums *FakeApi* | [**boolean**](docs/FakeApi.md#boolean) | **POST** /fake/refs/boolean | *FakeApi* | [**composed_one_of_number_with_validations**](docs/FakeApi.md#composed_one_of_number_with_validations) | **POST** /fake/refs/composed_one_of_number_with_validations | +*FakeApi* | [**enum_test**](docs/FakeApi.md#enum_test) | **POST** /fake/refs/enum-test | Object contains enum properties and array properties containing enums *FakeApi* | [**fake_health_get**](docs/FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint *FakeApi* | [**mammal**](docs/FakeApi.md#mammal) | **POST** /fake/refs/mammal | *FakeApi* | [**number_with_validations**](docs/FakeApi.md#number_with_validations) | **POST** /fake/refs/number | diff --git a/samples/openapi3/client/petstore/python/docs/EnumTest.md b/samples/openapi3/client/petstore/python/docs/EnumTest.md index 70969239ca25..706c1ebf0ecb 100644 --- a/samples/openapi3/client/petstore/python/docs/EnumTest.md +++ b/samples/openapi3/client/petstore/python/docs/EnumTest.md @@ -12,6 +12,8 @@ Name | Type | Description | Notes **string_enum_with_default_value** | [**StringEnumWithDefaultValue**](StringEnumWithDefaultValue.md) | | [optional] **integer_enum_with_default_value** | [**IntegerEnumWithDefaultValue**](IntegerEnumWithDefaultValue.md) | | [optional] **integer_enum_one_value** | [**IntegerEnumOneValue**](IntegerEnumOneValue.md) | | [optional] +**inline_array_of_str_enum** | [**[StringEnum]**](StringEnum.md) | | [optional] +**array_of_str_enum** | [**ArrayOfEnums**](ArrayOfEnums.md) | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index 164d7f9f8b49..ae713e6ee67a 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -9,6 +9,7 @@ Method | HTTP request | Description [**array_of_enums**](FakeApi.md#array_of_enums) | **POST** /fake/refs/array-of-enums | Array of Enums [**boolean**](FakeApi.md#boolean) | **POST** /fake/refs/boolean | [**composed_one_of_number_with_validations**](FakeApi.md#composed_one_of_number_with_validations) | **POST** /fake/refs/composed_one_of_number_with_validations | +[**enum_test**](FakeApi.md#enum_test) | **POST** /fake/refs/enum-test | Object contains enum properties and array properties containing enums [**fake_health_get**](FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint [**mammal**](FakeApi.md#mammal) | **POST** /fake/refs/mammal | [**number_with_validations**](FakeApi.md#number_with_validations) | **POST** /fake/refs/number | @@ -346,6 +347,84 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **enum_test** +> EnumTest enum_test() + +Object contains enum properties and array properties containing enums + +### Example + +```python +import time +import petstore_api +from petstore_api.api import fake_api +from petstore_api.model.enum_test import EnumTest +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. +configuration = petstore_api.Configuration( + host = "http://petstore.swagger.io:80/v2" +) + + +# Enter a context with an instance of the API client +with petstore_api.ApiClient() as api_client: + # Create an instance of the API class + api_instance = fake_api.FakeApi(api_client) + enum_test = EnumTest( + enum_string="UPPER", + enum_string_required="UPPER", + enum_integer=1, + enum_number=1.1, + string_enum=StringEnum("placed"), + integer_enum=IntegerEnum(0), + string_enum_with_default_value=StringEnumWithDefaultValue("placed"), + integer_enum_with_default_value=IntegerEnumWithDefaultValue(0), + integer_enum_one_value=IntegerEnumOneValue(0), + inline_array_of_str_enum=[ + StringEnum("placed"), + ], + array_of_str_enum=ArrayOfEnums([ + StringEnum("placed"), + ]), + ) # EnumTest | Input object (optional) + + # example passing only required values which don't have defaults set + # and optional values + try: + # Object contains enum properties and array properties containing enums + api_response = api_instance.enum_test(enum_test=enum_test) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->enum_test: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **enum_test** | [**EnumTest**](EnumTest.md)| Input object | [optional] + +### Return type + +[**EnumTest**](EnumTest.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Got object containing enums | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **fake_health_get** > HealthCheckResult fake_health_get() diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index 4ce055c011bd..d6fc4b80b4d7 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -26,6 +26,7 @@ from petstore_api.model.animal_farm import AnimalFarm from petstore_api.model.array_of_enums import ArrayOfEnums from petstore_api.model.client import Client from petstore_api.model.composed_one_of_number_with_validations import ComposedOneOfNumberWithValidations +from petstore_api.model.enum_test import EnumTest from petstore_api.model.file_schema_test_class import FileSchemaTestClass from petstore_api.model.health_check_result import HealthCheckResult from petstore_api.model.mammal import Mammal @@ -605,6 +606,117 @@ class FakeApi(object): callable=__composed_one_of_number_with_validations ) + def __enum_test( + self, + **kwargs + ): + """Object contains enum properties and array properties containing enums # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.enum_test(async_req=True) + >>> result = thread.get() + + + Keyword Args: + enum_test (EnumTest): Input object. [optional] + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (float/tuple): timeout setting for this request. If one + number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + EnumTest + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_host_index'] = kwargs.get('_host_index') + return self.call_with_http_info(**kwargs) + + self.enum_test = Endpoint( + settings={ + 'response_type': (EnumTest,), + 'auth': [], + 'endpoint_path': '/fake/refs/enum-test', + 'operation_id': 'enum_test', + 'http_method': 'POST', + 'servers': None, + }, + params_map={ + 'all': [ + 'enum_test', + ], + 'required': [], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'enum_test': + (EnumTest,), + }, + 'attribute_map': { + }, + 'location_map': { + 'enum_test': 'body', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [ + 'application/json' + ] + }, + api_client=api_client, + callable=__enum_test + ) + def __fake_health_get( self, **kwargs diff --git a/samples/openapi3/client/petstore/python/petstore_api/model/enum_test.py b/samples/openapi3/client/petstore/python/petstore_api/model/enum_test.py index efe4955e5734..f6062dd87bd0 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/model/enum_test.py +++ b/samples/openapi3/client/petstore/python/petstore_api/model/enum_test.py @@ -29,11 +29,13 @@ from petstore_api.model_utils import ( # noqa: F401 ) def lazy_import(): + from petstore_api.model.array_of_enums import ArrayOfEnums from petstore_api.model.integer_enum import IntegerEnum from petstore_api.model.integer_enum_one_value import IntegerEnumOneValue from petstore_api.model.integer_enum_with_default_value import IntegerEnumWithDefaultValue from petstore_api.model.string_enum import StringEnum from petstore_api.model.string_enum_with_default_value import StringEnumWithDefaultValue + globals()['ArrayOfEnums'] = ArrayOfEnums globals()['IntegerEnum'] = IntegerEnum globals()['IntegerEnumOneValue'] = IntegerEnumOneValue globals()['IntegerEnumWithDefaultValue'] = IntegerEnumWithDefaultValue @@ -114,6 +116,8 @@ class EnumTest(ModelNormal): 'string_enum_with_default_value': (StringEnumWithDefaultValue,), # noqa: E501 'integer_enum_with_default_value': (IntegerEnumWithDefaultValue,), # noqa: E501 'integer_enum_one_value': (IntegerEnumOneValue,), # noqa: E501 + 'inline_array_of_str_enum': ([StringEnum],), # noqa: E501 + 'array_of_str_enum': (ArrayOfEnums,), # noqa: E501 } @cached_property @@ -131,6 +135,8 @@ class EnumTest(ModelNormal): 'string_enum_with_default_value': 'StringEnumWithDefaultValue', # noqa: E501 'integer_enum_with_default_value': 'IntegerEnumWithDefaultValue', # noqa: E501 'integer_enum_one_value': 'IntegerEnumOneValue', # noqa: E501 + 'inline_array_of_str_enum': 'InlineArrayOfStrEnum', # noqa: E501 + 'array_of_str_enum': 'ArrayOfStrEnum', # noqa: E501 } _composed_schemas = {} @@ -190,6 +196,8 @@ class EnumTest(ModelNormal): string_enum_with_default_value (StringEnumWithDefaultValue): [optional] # noqa: E501 integer_enum_with_default_value (IntegerEnumWithDefaultValue): [optional] # noqa: E501 integer_enum_one_value (IntegerEnumOneValue): [optional] # noqa: E501 + inline_array_of_str_enum ([StringEnum]): [optional] # noqa: E501 + array_of_str_enum (ArrayOfEnums): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/samples/openapi3/client/petstore/python/petstore_api/model_utils.py b/samples/openapi3/client/petstore/python/petstore_api/model_utils.py index 7afcb68f615e..ae5547106703 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/model_utils.py +++ b/samples/openapi3/client/petstore/python/petstore_api/model_utils.py @@ -1493,10 +1493,13 @@ def model_to_dict(model_instance, serialize=True): # exist in attribute_map attr = model_instance.attribute_map.get(attr, attr) if isinstance(value, list): - result[attr] = list(map( - lambda x: model_to_dict(x, serialize=serialize) - if hasattr(x, '_data_store') else x, value - )) + if not value or isinstance(value[0], PRIMITIVE_TYPES): + # empty list or primitive types + result[attr] = value + elif isinstance(value[0], ModelSimple): + result[attr] = [x.value for x in value] + else: + result[attr] = [model_to_dict(x, serialize=serialize) for x in value] elif isinstance(value, dict): result[attr] = dict(map( lambda item: (item[0], diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_enum_test.py b/samples/openapi3/client/petstore/python/tests_manual/test_enum_test.py new file mode 100644 index 000000000000..3f56fd960d37 --- /dev/null +++ b/samples/openapi3/client/petstore/python/tests_manual/test_enum_test.py @@ -0,0 +1,46 @@ +# coding: utf-8 + +""" + OpenAPI Petstore + + This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ # noqa: E501 + + The version of the OpenAPI document: 1.0.0 + Generated by: https://openapi-generator.tech +""" + + +import sys +import unittest + +import petstore_api +from petstore_api.model.enum_test import EnumTest +from petstore_api.model.string_enum import StringEnum +from petstore_api.model.array_of_enums import ArrayOfEnums + + +class TestEnumTest(unittest.TestCase): + """EnumTest unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testEnumTest(self): + """Test EnumTest""" + # inline array of enums + model = EnumTest( + enum_string_required='lower', + inline_array_of_str_enum=[StringEnum('approved')] + ) + # refed array of enums + model = EnumTest( + enum_string_required='lower', + array_of_str_enum=ArrayOfEnums([StringEnum('approved')]) + ) + + +if __name__ == '__main__': + unittest.main() diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py index 6efc3c4bc0e6..52e39fb2fbc0 100644 --- a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py +++ b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py @@ -119,6 +119,52 @@ class TestFakeApi(unittest.TestCase): """ pass + def test_enum_test(self): + """Test case for enum_test + + Object contains enum properties and array properties containing enums + """ + from petstore_api.model.enum_test import EnumTest + from petstore_api.model.string_enum import StringEnum + from petstore_api.model.array_of_enums import ArrayOfEnums + + endpoint = self.api.enum_test + assert endpoint.openapi_types['enum_test'] == (EnumTest,) + assert endpoint.settings['response_type'] == (EnumTest,) + + # serialization + deserialization works w/ inline array + with patch.object(RESTClientObject, 'request') as mock_method: + body = EnumTest( + enum_string_required='lower', + inline_array_of_str_enum=[StringEnum('approved')] + ) + json_value = {'enum_string_required': 'lower', 'InlineArrayOfStrEnum': ['approved']} + mock_method.return_value = self.mock_response(json_value) + + response = endpoint(enum_test=body) + self.assert_request_called_with( + mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', json_value) + + assert isinstance(response, EnumTest) + assert response == body + + # serialization + deserialization works w/ refed array + with patch.object(RESTClientObject, 'request') as mock_method: + body = EnumTest( + enum_string_required='lower', + array_of_str_enum=ArrayOfEnums([StringEnum('approved')]) + ) + json_value = {'enum_string_required': 'lower', 'ArrayOfStrEnum': ['approved']} + mock_method.return_value = self.mock_response(json_value) + + response = endpoint(enum_test=body) + self.assert_request_called_with( + mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', json_value) + + assert isinstance(response, EnumTest) + assert response == body + + def test_array_of_enums(self): """Test case for array_of_enums From 646bcc64add4cfce7dfbe78195dd727bd11cb5d0 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@users.noreply.github.com> Date: Sun, 10 Jan 2021 05:50:19 +0000 Subject: [PATCH 02/23] [Swift 5] code formatting (#8385) * [swift] improve code formatting * [swift] update sample projects * Revert "[swift] improve code formatting" This reverts commit 0cc280509cae1a9a581ea4ed92d8141dd0f35a5c. * [swift] update sample projects --- .../main/resources/swift5/APIHelper.mustache | 14 ++++---- .../src/main/resources/swift5/APIs.mustache | 2 +- .../resources/swift5/CodableHelper.mustache | 21 ++++++------ .../resources/swift5/Configuration.mustache | 8 ++--- .../resources/swift5/Package.swift.mustache | 5 +-- .../AlamofireImplementations.mustache | 26 +++++++------- .../URLSessionImplementations.mustache | 26 +++++++------- .../swift5/alamofireLibrary/Package.swift | 11 +++--- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../OpenAPIs/AlamofireImplementations.swift | 34 +++++++++---------- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../swift5/combineLibrary/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../petstore/swift5/default/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../petstore/swift5/deprecated/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/nonPublicApi/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/objcCompatible/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/promisekitLibrary/Package.swift | 11 +++--- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/readonlyProperties/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/resultLibrary/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/rxswiftLibrary/Package.swift | 9 ++--- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- .../swift5/urlsessionLibrary/Package.swift | 7 ++-- .../PetstoreClient.xcodeproj/project.pbxproj | 4 +-- .../Classes/OpenAPIs/APIHelper.swift | 14 ++++---- .../Classes/OpenAPIs/APIs.swift | 2 +- .../Classes/OpenAPIs/CodableHelper.swift | 21 ++++++------ .../Classes/OpenAPIs/Configuration.swift | 8 ++--- .../Classes/OpenAPIs/Extensions.swift | 34 +++++++++---------- .../OpenAPIs/URLSessionImplementations.swift | 32 ++++++++--------- 95 files changed, 728 insertions(+), 728 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache index 2630944598bc..94dc810006a6 100644 --- a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache @@ -8,7 +8,7 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct APIHelper { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ import Foundation } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ import Foundation return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache index d672115546f9..42bdf74007f1 100644 --- a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache @@ -52,7 +52,7 @@ import Foundation } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self { - self.credential = {{projectName}}API.credential + credential = {{projectName}}API.credential return self } } diff --git a/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache b/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache index d5b1c1e0a299..554418a5ee6d 100644 --- a/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache @@ -8,41 +8,42 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache b/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache index 47c874815b95..78f54279711d 100644 --- a/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache @@ -7,10 +7,8 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache b/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache index 0e00b556e8d6..d173f21077b2 100644 --- a/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "{{projectName}}", - targets: ["{{projectName}}"]), + targets: ["{{projectName}}"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache index ef593fe75973..71e9670965bf 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache @@ -117,14 +117,14 @@ private var managerStore = SynchronizedDictionary [String: String] { var httpHeaders = SessionManager.defaultHTTPHeaders - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } return httpHeaders @@ -317,7 +317,7 @@ private var managerStore = SynchronizedDictionary URLRequest { let urlRequest = try urlRequest.asURLRequest() - return self.encode(urlRequest, with: parameters) + return encode(urlRequest, with: parameters) } } diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache index 594e9c7c1cd9..896871b8d7ec 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache @@ -209,11 +209,11 @@ private var urlSessionStore = SynchronizedDictionary() let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ private var urlSessionStore = SynchronizedDictionary() } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ private var urlSessionStore = SynchronizedDictionary() {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in {{projectName}}API.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/alamofireLibrary/Package.swift b/samples/client/petstore/swift5/alamofireLibrary/Package.swift index 9371b3d57bd4..1bf8d9cfdd26 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/Package.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/Package.swift @@ -8,25 +8,26 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1") + .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "PetstoreClient", - dependencies: ["Alamofire" ], + dependencies: ["Alamofire", ], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj index a03104894c7c..247eae5b0c52 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 6ee033b07f37..c6beeedf9a4b 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -49,7 +49,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift index 9685c32b69ea..a92b70c427ba 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift @@ -9,11 +9,11 @@ import Alamofire class AlamofireRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return AlamofireRequestBuilder.self + AlamofireRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return AlamofireDecodableRequestBuilder.self + AlamofireDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class AlamofireRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -73,7 +73,7 @@ open class AlamofireRequestBuilder: RequestBuilder { configuration (e.g. to override the cache policy). */ open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest { - return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers) + manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers) } override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result, Error>) -> Void) { @@ -117,14 +117,14 @@ open class AlamofireRequestBuilder: RequestBuilder { fatalError("Unprocessable value \(v) with key \(k)") } } - }, to: URLString, method: xMethod, headers: nil, encodingCompletion: { encodingResult in + }, to: URLString, method: xMethod, headers: nil, encodingCompletion: { encodingResult in switch encodingResult { - case .success(let upload, _, _): + case let .success(upload, _, _): if let onProgressReady = self.onProgressReady { onProgressReady(upload.uploadProgress) } self.processRequest(request: upload, managerId, apiResponseQueue, completion) - case .failure(let encodingError): + case let .failure(encodingError): apiResponseQueue.async { completion(.failure(ErrorResponse.error(415, nil, nil, encodingError))) } @@ -159,7 +159,7 @@ open class AlamofireRequestBuilder: RequestBuilder { switch T.self { case is String.Type: - validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in + validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { stringResponse in cleanupRequest() switch stringResponse.result { @@ -171,7 +171,7 @@ open class AlamofireRequestBuilder: RequestBuilder { }) case is URL.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() do { @@ -209,13 +209,13 @@ open class AlamofireRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, dataResponse.data, dataResponse.response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, dataResponse.data, dataResponse.response, error))) } return }) case is Void.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { voidResponse in cleanupRequest() switch voidResponse.result { @@ -227,7 +227,7 @@ open class AlamofireRequestBuilder: RequestBuilder { }) default: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() switch dataResponse.result { @@ -243,7 +243,7 @@ open class AlamofireRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders = SessionManager.defaultHTTPHeaders - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } return httpHeaders @@ -317,7 +317,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild switch T.self { case is String.Type: - validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in + validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { stringResponse in cleanupRequest() switch stringResponse.result { @@ -329,7 +329,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild }) case is Void.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { voidResponse in cleanupRequest() switch voidResponse.result { @@ -341,7 +341,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild }) case is Data.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() switch dataResponse.result { @@ -402,6 +402,6 @@ extension JSONDataEncoding: ParameterEncoding { public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { let urlRequest = try urlRequest.asURLRequest() - return self.encode(urlRequest, with: parameters) + return encode(urlRequest, with: parameters) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/combineLibrary/Package.swift b/samples/client/petstore/swift5/combineLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/combineLibrary/Package.swift +++ b/samples/client/petstore/swift5/combineLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/default/Package.swift b/samples/client/petstore/swift5/default/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/default/Package.swift +++ b/samples/client/petstore/swift5/default/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/deprecated/Package.swift b/samples/client/petstore/swift5/deprecated/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/deprecated/Package.swift +++ b/samples/client/petstore/swift5/deprecated/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj index bb500a9c713e..f5af581f9fb6 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj @@ -224,7 +224,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -307,7 +307,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift index 71c2a2fa5b7c..57308c82f8ed 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/nonPublicApi/Package.swift b/samples/client/petstore/swift5/nonPublicApi/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/nonPublicApi/Package.swift +++ b/samples/client/petstore/swift5/nonPublicApi/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index ddd555e5daa5..5d8f35bff492 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation internal struct APIHelper { internal static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ internal struct APIHelper { } internal static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ internal struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } internal static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } internal static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift index f5569a9fdf31..026f2295d319 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ internal class RequestBuilder { } internal func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index 280238b8263d..5055cd5ce803 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation internal class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() internal static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } internal static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } internal static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } internal class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } internal class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 4dfbe7b0cde7..3b39a978be4a 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation internal class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") internal static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift index e5511b3aa373..a6a3cf54df1e 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 11378e5653f3..c9bd304a6de2 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ internal func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ internal class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { internal func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg internal enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/objcCompatible/Package.swift b/samples/client/petstore/swift5/objcCompatible/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/objcCompatible/Package.swift +++ b/samples/client/petstore/swift5/objcCompatible/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/promisekitLibrary/Package.swift b/samples/client/petstore/swift5/promisekitLibrary/Package.swift index 4445c9794907..959c7bdaf458 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/Package.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/Package.swift @@ -8,25 +8,26 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0") + .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "PetstoreClient", - dependencies: ["PromiseKit" ], + dependencies: ["PromiseKit", ], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj index 7664d648f4f5..144cd4d8e944 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 736702ea5dd9..31bfaa0255f8 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -8,35 +8,35 @@ import Foundation import PromiseKit extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -49,7 +49,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -65,32 +65,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -98,11 +98,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -175,7 +175,7 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/readonlyProperties/Package.swift b/samples/client/petstore/swift5/readonlyProperties/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/readonlyProperties/Package.swift +++ b/samples/client/petstore/swift5/readonlyProperties/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/resultLibrary/Package.swift b/samples/client/petstore/swift5/resultLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/resultLibrary/Package.swift +++ b/samples/client/petstore/swift5/resultLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift index 24f9a6c99ae5..e774d3e15c77 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift @@ -8,17 +8,18 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0") + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -27,6 +28,6 @@ let package = Package( name: "PetstoreClient", dependencies: ["RxSwift"], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj index a039b69cf53f..eb19c9c18571 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent From f136b9fd01289e116a75f585b85ee92aa7356b7c Mon Sep 17 00:00:00 2001 From: Esteban Gehring Date: Sun, 10 Jan 2021 07:46:31 +0100 Subject: [PATCH 03/23] docs: improve pull request checklist (#8349) * docs: improve pull request checklist include build command before updating samples * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 634ba51b9bdb..7f2e3d8d432c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,6 +6,17 @@ - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md). - [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community. - [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand. -- [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/). +- [ ] Run + ``` + mvn clean package + ./bin/generate-samples.sh + ./bin/utils/export_docs_generators.sh + ``` + to update all Petstore samples related to your fix. + Commit all changed files. + This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. + These must match the expectations made by your contribution. + You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. + For Windows users, please run the script in [Git BASH](https://gitforwindows.org/). - [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `5.1.x`, `6.0.x` - [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language. From 0284fcd5c7c42c681a37ecea15d84ba95718e788 Mon Sep 17 00:00:00 2001 From: Hui Yu Date: Sun, 10 Jan 2021 15:10:05 +0800 Subject: [PATCH 04/23] [C][Client] Fix the memory leak when a JSON string of model fails to parse. (#8390) --- .../main/resources/C-libcurl/model-body.mustache | 14 ++++++++++++++ .../client/petstore/c/.openapi-generator/VERSION | 2 +- samples/client/petstore/c/model/pet.c | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache index 0f9ec305c74c..e487cb0f4746 100644 --- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache +++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache @@ -803,6 +803,20 @@ fail: return {{classname}}_local_var; end: + {{#vars}} + {{^isContainer}} + {{^isPrimitiveType}} + {{#isModel}} + {{^isEnum}} + if ({{{name}}}_local_nonprim) { + {{complexType}}_free({{{name}}}_local_nonprim); + {{{name}}}_local_nonprim = NULL; + } + {{/isEnum}} + {{/isModel}} + {{/isPrimitiveType}} + {{/isContainer}} + {{/vars}} return NULL; } diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION index d99e7162d01f..3fa3b389a57d 100644 --- a/samples/client/petstore/c/.openapi-generator/VERSION +++ b/samples/client/petstore/c/.openapi-generator/VERSION @@ -1 +1 @@ -5.0.0-SNAPSHOT \ No newline at end of file +5.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/c/model/pet.c b/samples/client/petstore/c/model/pet.c index 8acdcfa132e7..5ee8445640bf 100644 --- a/samples/client/petstore/c/model/pet.c +++ b/samples/client/petstore/c/model/pet.c @@ -264,6 +264,10 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){ return pet_local_var; end: + if (category_local_nonprim) { + category_free(category_local_nonprim); + category_local_nonprim = NULL; + } return NULL; } From e26f44072929e7392c04ffe4158e4d9bff3658da Mon Sep 17 00:00:00 2001 From: Ryan Feeney Date: Sun, 10 Jan 2021 10:15:13 -0500 Subject: [PATCH 05/23] Remove modelFilesConstrainedTo from gradle example (#8312) --- modules/openapi-generator-gradle-plugin/README.adoc | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc index 09418f20fb88..a9f1c58ab185 100644 --- a/modules/openapi-generator-gradle-plugin/README.adoc +++ b/modules/openapi-generator-gradle-plugin/README.adoc @@ -469,9 +469,6 @@ openApiGenerate { apiPackage = "org.openapi.example.api" invokerPackage = "org.openapi.example.invoker" modelPackage = "org.openapi.example.model" - modelFilesConstrainedTo = [ - "Error" - ] configOptions = [ dateLibrary: "java8" ] From ed9133e77f24389c7a75d525c6647cecefbdc99a Mon Sep 17 00:00:00 2001 From: agilob Date: Mon, 11 Jan 2021 16:26:25 +0000 Subject: [PATCH 06/23] Make frequently used IO resources autoclosable (#8181) * Make frequently used IO resources autoclosable * Autoclose ruby error input stream --- .../openapitools/codegen/TemplateManager.java | 12 +++++------ .../languages/AbstractRubyCodegen.java | 21 +++++++++---------- .../codegen/languages/DartClientCodegen.java | 13 +++++++----- .../templating/MustacheEngineAdapter.java | 10 +++++++-- .../codegen/TemplateManagerTest.java | 2 +- .../codegen/dart/DartClientCodegenTest.java | 4 +++- 6 files changed, 36 insertions(+), 26 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java index aae44ff9353c..a0e67ad2730d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/TemplateManager.java @@ -109,15 +109,15 @@ public class TemplateManager implements TemplatingExecutor, TemplateProcessor { if (name == null || name.contains("..")) { throw new IllegalArgumentException("Template location must be constrained to template directory."); } - try { - Reader reader = getTemplateReader(name); + try (Reader reader = getTemplateReader(name)) { if (reader == null) { throw new RuntimeException("no file found"); } - Scanner s = new Scanner(reader).useDelimiter("\\A"); - return s.hasNext() ? s.next() : ""; + try (Scanner s = new Scanner(reader).useDelimiter("\\A")) { + return s.hasNext() ? s.next() : ""; + } } catch (Exception e) { - LOGGER.error(e.getMessage()); + LOGGER.error("{}", e.getMessage(), e); } throw new RuntimeException("can't load template " + name); } @@ -142,7 +142,7 @@ public class TemplateManager implements TemplatingExecutor, TemplateProcessor { if (name == null || name.contains("..")) { throw new IllegalArgumentException("Template location must be constrained to template directory."); } - is = new FileInputStream(new File(name)); // May throw but never return a null value + is = new FileInputStream(name); // May throw but never return a null value } return is; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java index 5143cc5e943c..0bd596818701 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java @@ -172,9 +172,7 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code @Override public String toVarName(final String name) { - String varName; - // sanitize name - varName = sanitizeName(name); + String varName = sanitizeName(name); // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { varName = varName.toLowerCase(Locale.ROOT); @@ -207,7 +205,7 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code // method name cannot use reserved keyword, e.g. return if (isReservedWord(operationId)) { String newOperationId = underscore("call_" + operationId); - LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId); + LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, newOperationId); return newOperationId; } @@ -241,15 +239,16 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code Process p = Runtime.getRuntime().exec(command); int exitValue = p.waitFor(); if (exitValue != 0) { - BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8)); - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) { - sb.append(line); + try(BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream(), StandardCharsets.UTF_8))) { + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + } + LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString()); } - LOGGER.error("Error running the command ({}). Exit value: {}, Error output: {}", command, exitValue, sb.toString()); } else { - LOGGER.info("Successfully executed: " + command); + LOGGER.info("Successfully executed: `{}`", command); } } catch (Exception e) { LOGGER.error("Error running the command ({}). Exception: {}", command, e.getMessage()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java index ce6c6234c387..987110760d41 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java @@ -19,9 +19,14 @@ package org.openapitools.codegen.languages; import java.io.BufferedReader; import java.io.File; +import java.io.IOException; import java.io.InputStreamReader; +import java.net.URI; +import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; +import java.nio.file.*; import java.util.*; +import java.util.stream.Collectors; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -116,15 +121,13 @@ public class DartClientCodegen extends DefaultCodegen { modelTestTemplateFiles.put("model_test.mustache", ".dart"); apiTestTemplateFiles.put("api_test.mustache", ".dart"); - List reservedWordsList = new ArrayList<>(); - try { - BufferedReader reader = new BufferedReader( + final List reservedWordsList = new ArrayList<>(); + try(BufferedReader reader = new BufferedReader( new InputStreamReader(DartClientCodegen.class.getResourceAsStream("/dart/dart-keywords.txt"), - StandardCharsets.UTF_8)); + StandardCharsets.UTF_8))) { while (reader.ready()) { reservedWordsList.add(reader.readLine()); } - reader.close(); } catch (Exception e) { LOGGER.error("Error reading dart keywords. Exception: {}", e.getMessage()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java index 72144e198916..5d17dbb2a7a3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/MustacheEngineAdapter.java @@ -20,6 +20,8 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; import org.openapitools.codegen.api.TemplatingEngineAdapter; import org.openapitools.codegen.api.TemplatingExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.Reader; @@ -29,6 +31,8 @@ import java.util.Map; public class MustacheEngineAdapter implements TemplatingEngineAdapter { + private static final Logger LOGGER = LoggerFactory.getLogger(TemplatingEngineAdapter.class); + /** * Provides an identifier used to load the adapter. This could be a name, uuid, or any other string. * @@ -64,9 +68,11 @@ public class MustacheEngineAdapter implements TemplatingEngineAdapter { @SuppressWarnings({"java:S108"}) // catch-all is expected, and is later thrown public Reader findTemplate(TemplatingExecutor generator, String name) { for (String extension : extensions) { + final String templateName = name + "." + extension; try { - return new StringReader(generator.getFullTemplateContents(name + "." + extension)); - } catch (Exception ignored) { + return new StringReader(generator.getFullTemplateContents(templateName)); + } catch (Exception exception) { + LOGGER.error("Failed to read full template {}, {}", templateName, exception.getMessage()); } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TemplateManagerTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TemplateManagerTest.java index 8d8587bf7890..1a15f28bbeff 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TemplateManagerTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TemplateManagerTest.java @@ -248,4 +248,4 @@ public class TemplateManagerTest { target.toFile().delete(); } } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java index f77402d01803..d69f5f71122a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java @@ -68,7 +68,9 @@ public class DartClientCodegenTest { List reservedWordsList = new ArrayList(); try { BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8"))); - while(reader.ready()) { reservedWordsList.add(reader.readLine()); } + while(reader.ready()) { + reservedWordsList.add(reader.readLine()); + } reader.close(); } catch (Exception e) { String errorString = String.format(Locale.ROOT, "Error reading dart keywords: %s", e); From ce3e0c7d68308799ae2628793d88da05018b433d Mon Sep 17 00:00:00 2001 From: Gokul Raj S <56819171+GORA-SAG@users.noreply.github.com> Date: Tue, 12 Jan 2021 08:06:03 +0530 Subject: [PATCH 07/23] 7358 (#8388) 1. unable to use --global-property models="User,Pet" as this creates only User model. 2. to solve the issue, instead of "," separator used ":" separator 3. made some changes with that --- .../openapitools/codegen/config/CodegenConfiguratorUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java index e6251baa8f04..e1c840d4b840 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java @@ -51,7 +51,7 @@ public final class CodegenConfiguratorUtils { public static void applyGlobalPropertiesKvp(String globalProperties, CodegenConfigurator configurator) { final Map map = createMapFromKeyValuePairs(globalProperties); for (Map.Entry entry : map.entrySet()) { - configurator.addGlobalProperty(entry.getKey(), entry.getValue()); + configurator.addGlobalProperty(entry.getKey(), entry.getValue().replace(":",",")); } } From 1c85fdc473d660ed0105b4d9c4052b937183a6ca Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 12 Jan 2021 10:47:09 +0800 Subject: [PATCH 08/23] update doc to use colon as the separator (#8411) --- docs/customization.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/customization.md b/docs/customization.md index dbdfc6634bce..80774a0271ee 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -188,7 +188,7 @@ The default is generate *everything* supported by the specific library. Once you To control the specific files being generated, you can pass a CSV list of what you want: ```sh # generate the User and Pet models only ---global-property models="User,Pet" +--global-property models="User:Pet" # generate the User model and the supportingFile `StringUtil.java`: --global-property models=User,supportingFiles=StringUtil.java @@ -205,7 +205,7 @@ These options default to true and don't limit the generation of the feature opti --global-property models,modelDocs=false # generate only User and Pet models (no tests and no documentation) ---global-property models="User,Pet",modelTests=false +--global-property models="User:Pet",modelTests=false # generate only apis (without tests) --global-property apis,apiTests=false From a80788d424100df60fe9c7ad5aec43fa6061ad5a Mon Sep 17 00:00:00 2001 From: Sergey Terentyev Date: Tue, 12 Jan 2021 05:13:07 +0200 Subject: [PATCH 09/23] Renamed basic authentication function in sttp client (#8396) * Fix #8395 - changed function name to basic * Fix #8395 - changed function name to basic * Fix #8395 - removed test.yaml file Co-authored-by: sergey --- .../src/main/resources/scala-sttp/api.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache index 353d61af7f21..fa99fc624755 100644 --- a/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache +++ b/modules/openapi-generator/src/main/resources/scala-sttp/api.mustache @@ -25,7 +25,7 @@ class {{classname}}(baseUrl: String) { .method(Method.{{httpMethod.toUpperCase}}, uri"$baseUrl{{{path}}}{{#queryParams.0}}?{{#queryParams}}{{baseName}}=${ {{{paramName}}} }{{^-last}}&{{/-last}}{{/queryParams}}{{/queryParams.0}}{{#isApiKey}}{{#isKeyInQuery}}{{^queryParams.0}}?{{/queryParams.0}}{{#queryParams.0}}&{{/queryParams.0}}{{keyParamName}}=${apiKey.value}&{{/isKeyInQuery}}{{/isApiKey}}") .contentType({{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{^consumes}}"application/json"{{/consumes}}){{#headerParams}} .header({{>paramCreation}}){{/headerParams}}{{#authMethods}}{{#isBasic}}{{#isBasicBasic}} - .auth.withCredentials(username, password){{/isBasicBasic}}{{#isBasicBearer}} + .auth.basic(username, password){{/isBasicBasic}}{{#isBasicBearer}} .auth.bearer(bearerToken){{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}} .header("{{keyParamName}}", apiKey){{/isKeyInHeader}}{{#isKeyInCookie}} .cookie("{{keyParamName}}", apiKey){{/isKeyInCookie}}{{/isApiKey}}{{/authMethods}}{{#formParams.0}}{{^isMultipart}} From 008ddfb1ef9ab6f601d0f290823353c353bd4873 Mon Sep 17 00:00:00 2001 From: Thessi Date: Tue, 12 Jan 2021 17:01:48 +0100 Subject: [PATCH 10/23] [typescript-angular] Fix configuration import in apiInterface.mustache when the configurationPrefix option is used (#8416) Co-authored-by: Stefan Straka --- .../src/main/resources/typescript-angular/apiInterface.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache index 89fed56e2674..ca0def9d404b 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache @@ -8,7 +8,7 @@ import { {{classname}} } from '../model/models'; {{/imports}} -import { Configuration } from '../configuration'; +import { {{configurationClassName}} } from '../configuration'; {{#operations}} From 6b6d1b1a97691a12eaee6f01491831365035fe01 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 13 Jan 2021 17:38:41 +0100 Subject: [PATCH 11/23] [python] fix #8404: avoid shadowing the name Endpoint (#8405) if a type was named Endpoint, its import for use in the api would shadow the name Endpoint for the internal utility --- .../src/main/resources/python/api.mustache | 4 +- .../petstore_api/api/another_fake_api.py | 4 +- .../python/petstore_api/api/fake_api.py | 34 +++++++------- .../api/fake_classname_tags_123_api.py | 4 +- .../python/petstore_api/api/pet_api.py | 20 ++++----- .../python/petstore_api/api/store_api.py | 10 ++--- .../python/petstore_api/api/user_api.py | 18 ++++---- .../python/x_auth_id_alias/api/usage_api.py | 10 ++--- .../python/dynamic_servers/api/usage_api.py | 6 +-- .../petstore_api/api/another_fake_api.py | 4 +- .../python/petstore_api/api/default_api.py | 4 +- .../python/petstore_api/api/fake_api.py | 44 +++++++++---------- .../api/fake_classname_tags_123_api.py | 4 +- .../python/petstore_api/api/pet_api.py | 20 ++++----- .../python/petstore_api/api/store_api.py | 10 ++--- .../python/petstore_api/api/user_api.py | 18 ++++---- 16 files changed, 107 insertions(+), 107 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache index a2a3d53697ac..cbad6df2c543 100644 --- a/modules/openapi-generator/src/main/resources/python/api.mustache +++ b/modules/openapi-generator/src/main/resources/python/api.mustache @@ -3,7 +3,7 @@ import re # noqa: F401 import sys # noqa: F401 -from {{packageName}}.api_client import ApiClient, Endpoint +from {{packageName}}.api_client import ApiClient, Endpoint as _Endpoint from {{packageName}}.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -125,7 +125,7 @@ class {{classname}}(object): {{/requiredParams}} return self.call_with_http_info(**kwargs) - self.{{operationId}} = Endpoint( + self.{{operationId}} = _Endpoint( settings={ 'response_type': {{#returnType}}({{{returnType}}},){{/returnType}}{{^returnType}}None{{/returnType}}, {{#authMethods}} diff --git a/samples/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/client/petstore/python/petstore_api/api/another_fake_api.py index f476fcf97bc9..9c75f7d5a83e 100644 --- a/samples/client/petstore/python/petstore_api/api/another_fake_api.py +++ b/samples/client/petstore/python/petstore_api/api/another_fake_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class AnotherFakeApi(object): body return self.call_with_http_info(**kwargs) - self.call_123_test_special_tags = Endpoint( + self.call_123_test_special_tags = _Endpoint( settings={ 'response_type': (Client,), 'auth': [], diff --git a/samples/client/petstore/python/petstore_api/api/fake_api.py b/samples/client/petstore/python/petstore_api/api/fake_api.py index bebae13a1bc7..aaf44e6f64c8 100644 --- a/samples/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/client/petstore/python/petstore_api/api/fake_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -105,7 +105,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.array_model = Endpoint( + self.array_model = _Endpoint( settings={ 'response_type': (AnimalFarm,), 'auth': [], @@ -215,7 +215,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.boolean = Endpoint( + self.boolean = _Endpoint( settings={ 'response_type': (bool,), 'auth': [], @@ -329,7 +329,7 @@ class FakeApi(object): xml_item return self.call_with_http_info(**kwargs) - self.create_xml_item = Endpoint( + self.create_xml_item = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -446,7 +446,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.number_with_validations = Endpoint( + self.number_with_validations = _Endpoint( settings={ 'response_type': (NumberWithValidations,), 'auth': [], @@ -556,7 +556,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.object_model_with_ref_props = Endpoint( + self.object_model_with_ref_props = _Endpoint( settings={ 'response_type': (ObjectModelWithRefProps,), 'auth': [], @@ -666,7 +666,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.string = Endpoint( + self.string = _Endpoint( settings={ 'response_type': (str,), 'auth': [], @@ -776,7 +776,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.string_enum = Endpoint( + self.string_enum = _Endpoint( settings={ 'response_type': (StringEnum,), 'auth': [], @@ -890,7 +890,7 @@ class FakeApi(object): body return self.call_with_http_info(**kwargs) - self.test_body_with_file_schema = Endpoint( + self.test_body_with_file_schema = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1009,7 +1009,7 @@ class FakeApi(object): body return self.call_with_http_info(**kwargs) - self.test_body_with_query_params = Endpoint( + self.test_body_with_query_params = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1131,7 +1131,7 @@ class FakeApi(object): body return self.call_with_http_info(**kwargs) - self.test_client_model = Endpoint( + self.test_client_model = _Endpoint( settings={ 'response_type': (Client,), 'auth': [], @@ -1265,7 +1265,7 @@ class FakeApi(object): header_number return self.call_with_http_info(**kwargs) - self.test_endpoint_enums_length_one = Endpoint( + self.test_endpoint_enums_length_one = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1451,7 +1451,7 @@ class FakeApi(object): byte return self.call_with_http_info(**kwargs) - self.test_endpoint_parameters = Endpoint( + self.test_endpoint_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -1690,7 +1690,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.test_enum_parameters = Endpoint( + self.test_enum_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1905,7 +1905,7 @@ class FakeApi(object): required_int64_group return self.call_with_http_info(**kwargs) - self.test_group_parameters = Endpoint( + self.test_group_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -2046,7 +2046,7 @@ class FakeApi(object): param return self.call_with_http_info(**kwargs) - self.test_inline_additional_properties = Endpoint( + self.test_inline_additional_properties = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -2165,7 +2165,7 @@ class FakeApi(object): param2 return self.call_with_http_info(**kwargs) - self.test_json_form_data = Endpoint( + self.test_json_form_data = _Endpoint( settings={ 'response_type': None, 'auth': [], diff --git a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py index 8338253f84d5..1d1afc214c14 100644 --- a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class FakeClassnameTags123Api(object): body return self.call_with_http_info(**kwargs) - self.test_classname = Endpoint( + self.test_classname = _Endpoint( settings={ 'response_type': (Client,), 'auth': [ diff --git a/samples/client/petstore/python/petstore_api/api/pet_api.py b/samples/client/petstore/python/petstore_api/api/pet_api.py index 9bd9bfcc3cec..2989ca8d4ab7 100644 --- a/samples/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/client/petstore/python/petstore_api/api/pet_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class PetApi(object): body return self.call_with_http_info(**kwargs) - self.add_pet = Endpoint( + self.add_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -221,7 +221,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.delete_pet = Endpoint( + self.delete_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -343,7 +343,7 @@ class PetApi(object): status return self.call_with_http_info(**kwargs) - self.find_pets_by_status = Endpoint( + self.find_pets_by_status = _Endpoint( settings={ 'response_type': ([Pet],), 'auth': [ @@ -471,7 +471,7 @@ class PetApi(object): tags return self.call_with_http_info(**kwargs) - self.find_pets_by_tags = Endpoint( + self.find_pets_by_tags = _Endpoint( settings={ 'response_type': ([Pet],), 'auth': [ @@ -592,7 +592,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.get_pet_by_id = Endpoint( + self.get_pet_by_id = _Endpoint( settings={ 'response_type': (Pet,), 'auth': [ @@ -711,7 +711,7 @@ class PetApi(object): body return self.call_with_http_info(**kwargs) - self.update_pet = Endpoint( + self.update_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -831,7 +831,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.update_pet_with_form = Endpoint( + self.update_pet_with_form = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -962,7 +962,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.upload_file = Endpoint( + self.upload_file = _Endpoint( settings={ 'response_type': (ApiResponse,), 'auth': [ @@ -1103,7 +1103,7 @@ class PetApi(object): required_file return self.call_with_http_info(**kwargs) - self.upload_file_with_required_file = Endpoint( + self.upload_file_with_required_file = _Endpoint( settings={ 'response_type': (ApiResponse,), 'auth': [ diff --git a/samples/client/petstore/python/petstore_api/api/store_api.py b/samples/client/petstore/python/petstore_api/api/store_api.py index 27417cde4eb5..c30ca943b2dc 100644 --- a/samples/client/petstore/python/petstore_api/api/store_api.py +++ b/samples/client/petstore/python/petstore_api/api/store_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class StoreApi(object): order_id return self.call_with_http_info(**kwargs) - self.delete_order = Endpoint( + self.delete_order = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -212,7 +212,7 @@ class StoreApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.get_inventory = Endpoint( + self.get_inventory = _Endpoint( settings={ 'response_type': ({str: (int,)},), 'auth': [ @@ -324,7 +324,7 @@ class StoreApi(object): order_id return self.call_with_http_info(**kwargs) - self.get_order_by_id = Endpoint( + self.get_order_by_id = _Endpoint( settings={ 'response_type': (Order,), 'auth': [], @@ -447,7 +447,7 @@ class StoreApi(object): body return self.call_with_http_info(**kwargs) - self.place_order = Endpoint( + self.place_order = _Endpoint( settings={ 'response_type': (Order,), 'auth': [], diff --git a/samples/client/petstore/python/petstore_api/api/user_api.py b/samples/client/petstore/python/petstore_api/api/user_api.py index 8df2eca21f0f..a5ef0d5c3092 100644 --- a/samples/client/petstore/python/petstore_api/api/user_api.py +++ b/samples/client/petstore/python/petstore_api/api/user_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class UserApi(object): body return self.call_with_http_info(**kwargs) - self.create_user = Endpoint( + self.create_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -215,7 +215,7 @@ class UserApi(object): body return self.call_with_http_info(**kwargs) - self.create_users_with_array_input = Endpoint( + self.create_users_with_array_input = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -328,7 +328,7 @@ class UserApi(object): body return self.call_with_http_info(**kwargs) - self.create_users_with_list_input = Endpoint( + self.create_users_with_list_input = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -442,7 +442,7 @@ class UserApi(object): username return self.call_with_http_info(**kwargs) - self.delete_user = Endpoint( + self.delete_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -556,7 +556,7 @@ class UserApi(object): username return self.call_with_http_info(**kwargs) - self.get_user_by_name = Endpoint( + self.get_user_by_name = _Endpoint( settings={ 'response_type': (User,), 'auth': [], @@ -677,7 +677,7 @@ class UserApi(object): password return self.call_with_http_info(**kwargs) - self.login_user = Endpoint( + self.login_user = _Endpoint( settings={ 'response_type': (str,), 'auth': [], @@ -795,7 +795,7 @@ class UserApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.logout_user = Endpoint( + self.logout_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -907,7 +907,7 @@ class UserApi(object): body return self.call_with_http_info(**kwargs) - self.update_user = Endpoint( + self.update_user = _Endpoint( settings={ 'response_type': None, 'auth': [], diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api/usage_api.py b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api/usage_api.py index 781d7ee3056d..e05577ea1193 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api/usage_api.py +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api/usage_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from x_auth_id_alias.api_client import ApiClient, Endpoint +from x_auth_id_alias.api_client import ApiClient, Endpoint as _Endpoint from x_auth_id_alias.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -96,7 +96,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.any_key = Endpoint( + self.any_key = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [ @@ -204,7 +204,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.both_keys = Endpoint( + self.both_keys = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [ @@ -312,7 +312,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.key_in_header = Endpoint( + self.key_in_header = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [ @@ -419,7 +419,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.key_in_query = Endpoint( + self.key_in_query = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [ diff --git a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api/usage_api.py b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api/usage_api.py index 7374d921e421..5da74def3fbb 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api/usage_api.py +++ b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api/usage_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from dynamic_servers.api_client import ApiClient, Endpoint +from dynamic_servers.api_client import ApiClient, Endpoint as _Endpoint from dynamic_servers.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -96,7 +96,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.custom_server = Endpoint( + self.custom_server = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [], @@ -250,7 +250,7 @@ class UsageApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.default_server = Endpoint( + self.default_server = _Endpoint( settings={ 'response_type': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), 'auth': [], diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py index a4ed30e32a23..4e6f26e4e336 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class AnotherFakeApi(object): client return self.call_with_http_info(**kwargs) - self.call_123_test_special_tags = Endpoint( + self.call_123_test_special_tags = _Endpoint( settings={ 'response_type': (Client,), 'auth': [], diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py index a7c791e75dbd..070ae6b4f47a 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -96,7 +96,7 @@ class DefaultApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.foo_get = Endpoint( + self.foo_get = _Endpoint( settings={ 'response_type': (InlineResponseDefault,), 'auth': [], diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index d6fc4b80b4d7..13460a26e1d8 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -109,7 +109,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.additional_properties_with_array_of_enums = Endpoint( + self.additional_properties_with_array_of_enums = _Endpoint( settings={ 'response_type': (AdditionalPropertiesWithArrayOfEnums,), 'auth': [], @@ -221,7 +221,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.array_model = Endpoint( + self.array_model = _Endpoint( settings={ 'response_type': (AnimalFarm,), 'auth': [], @@ -332,7 +332,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.array_of_enums = Endpoint( + self.array_of_enums = _Endpoint( settings={ 'response_type': (ArrayOfEnums,), 'auth': [], @@ -444,7 +444,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.boolean = Endpoint( + self.boolean = _Endpoint( settings={ 'response_type': (bool,), 'auth': [], @@ -556,7 +556,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.composed_one_of_number_with_validations = Endpoint( + self.composed_one_of_number_with_validations = _Endpoint( settings={ 'response_type': (ComposedOneOfNumberWithValidations,), 'auth': [], @@ -667,7 +667,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.enum_test = Endpoint( + self.enum_test = _Endpoint( settings={ 'response_type': (EnumTest,), 'auth': [], @@ -777,7 +777,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.fake_health_get = Endpoint( + self.fake_health_get = _Endpoint( settings={ 'response_type': (HealthCheckResult,), 'auth': [], @@ -887,7 +887,7 @@ class FakeApi(object): mammal return self.call_with_http_info(**kwargs) - self.mammal = Endpoint( + self.mammal = _Endpoint( settings={ 'response_type': (Mammal,), 'auth': [], @@ -1001,7 +1001,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.number_with_validations = Endpoint( + self.number_with_validations = _Endpoint( settings={ 'response_type': (NumberWithValidations,), 'auth': [], @@ -1113,7 +1113,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.object_model_with_ref_props = Endpoint( + self.object_model_with_ref_props = _Endpoint( settings={ 'response_type': (ObjectModelWithRefProps,), 'auth': [], @@ -1225,7 +1225,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.string = Endpoint( + self.string = _Endpoint( settings={ 'response_type': (str,), 'auth': [], @@ -1337,7 +1337,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.string_enum = Endpoint( + self.string_enum = _Endpoint( settings={ 'response_type': (StringEnum,), 'auth': [], @@ -1454,7 +1454,7 @@ class FakeApi(object): file_schema_test_class return self.call_with_http_info(**kwargs) - self.test_body_with_file_schema = Endpoint( + self.test_body_with_file_schema = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1573,7 +1573,7 @@ class FakeApi(object): user return self.call_with_http_info(**kwargs) - self.test_body_with_query_params = Endpoint( + self.test_body_with_query_params = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -1695,7 +1695,7 @@ class FakeApi(object): client return self.call_with_http_info(**kwargs) - self.test_client_model = Endpoint( + self.test_client_model = _Endpoint( settings={ 'response_type': (Client,), 'auth': [], @@ -1835,7 +1835,7 @@ class FakeApi(object): byte return self.call_with_http_info(**kwargs) - self.test_endpoint_parameters = Endpoint( + self.test_endpoint_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -2074,7 +2074,7 @@ class FakeApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.test_enum_parameters = Endpoint( + self.test_enum_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -2289,7 +2289,7 @@ class FakeApi(object): required_int64_group return self.call_with_http_info(**kwargs) - self.test_group_parameters = Endpoint( + self.test_group_parameters = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -2432,7 +2432,7 @@ class FakeApi(object): request_body return self.call_with_http_info(**kwargs) - self.test_inline_additional_properties = Endpoint( + self.test_inline_additional_properties = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -2551,7 +2551,7 @@ class FakeApi(object): param2 return self.call_with_http_info(**kwargs) - self.test_json_form_data = Endpoint( + self.test_json_form_data = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -2690,7 +2690,7 @@ class FakeApi(object): context return self.call_with_http_info(**kwargs) - self.test_query_parameter_collection_format = Endpoint( + self.test_query_parameter_collection_format = _Endpoint( settings={ 'response_type': None, 'auth': [], diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py index 2812a640b447..6e20a712d6f1 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class FakeClassnameTags123Api(object): client return self.call_with_http_info(**kwargs) - self.test_classname = Endpoint( + self.test_classname = _Endpoint( settings={ 'response_type': (Client,), 'auth': [ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py index 04f234512986..49e6e0694cdc 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class PetApi(object): pet return self.call_with_http_info(**kwargs) - self.add_pet = Endpoint( + self.add_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -231,7 +231,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.delete_pet = Endpoint( + self.delete_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -353,7 +353,7 @@ class PetApi(object): status return self.call_with_http_info(**kwargs) - self.find_pets_by_status = Endpoint( + self.find_pets_by_status = _Endpoint( settings={ 'response_type': ([Pet],), 'auth': [ @@ -482,7 +482,7 @@ class PetApi(object): tags return self.call_with_http_info(**kwargs) - self.find_pets_by_tags = Endpoint( + self.find_pets_by_tags = _Endpoint( settings={ 'response_type': ([Pet],), 'auth': [ @@ -604,7 +604,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.get_pet_by_id = Endpoint( + self.get_pet_by_id = _Endpoint( settings={ 'response_type': (Pet,), 'auth': [ @@ -723,7 +723,7 @@ class PetApi(object): pet return self.call_with_http_info(**kwargs) - self.update_pet = Endpoint( + self.update_pet = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -853,7 +853,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.update_pet_with_form = Endpoint( + self.update_pet_with_form = _Endpoint( settings={ 'response_type': None, 'auth': [ @@ -983,7 +983,7 @@ class PetApi(object): pet_id return self.call_with_http_info(**kwargs) - self.upload_file = Endpoint( + self.upload_file = _Endpoint( settings={ 'response_type': (ApiResponse,), 'auth': [ @@ -1118,7 +1118,7 @@ class PetApi(object): required_file return self.call_with_http_info(**kwargs) - self.upload_file_with_required_file = Endpoint( + self.upload_file_with_required_file = _Endpoint( settings={ 'response_type': (ApiResponse,), 'auth': [ diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py index a178960dff95..efbf40c16077 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class StoreApi(object): order_id return self.call_with_http_info(**kwargs) - self.delete_order = Endpoint( + self.delete_order = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -212,7 +212,7 @@ class StoreApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.get_inventory = Endpoint( + self.get_inventory = _Endpoint( settings={ 'response_type': ({str: (int,)},), 'auth': [ @@ -324,7 +324,7 @@ class StoreApi(object): order_id return self.call_with_http_info(**kwargs) - self.get_order_by_id = Endpoint( + self.get_order_by_id = _Endpoint( settings={ 'response_type': (Order,), 'auth': [], @@ -447,7 +447,7 @@ class StoreApi(object): order return self.call_with_http_info(**kwargs) - self.place_order = Endpoint( + self.place_order = _Endpoint( settings={ 'response_type': (Order,), 'auth': [], diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py index 0cc9d46c9b5f..9af3abfd19fb 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py @@ -11,7 +11,7 @@ import re # noqa: F401 import sys # noqa: F401 -from petstore_api.api_client import ApiClient, Endpoint +from petstore_api.api_client import ApiClient, Endpoint as _Endpoint from petstore_api.model_utils import ( # noqa: F401 check_allowed_values, check_validations, @@ -102,7 +102,7 @@ class UserApi(object): user return self.call_with_http_info(**kwargs) - self.create_user = Endpoint( + self.create_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -217,7 +217,7 @@ class UserApi(object): user return self.call_with_http_info(**kwargs) - self.create_users_with_array_input = Endpoint( + self.create_users_with_array_input = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -332,7 +332,7 @@ class UserApi(object): user return self.call_with_http_info(**kwargs) - self.create_users_with_list_input = Endpoint( + self.create_users_with_list_input = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -448,7 +448,7 @@ class UserApi(object): username return self.call_with_http_info(**kwargs) - self.delete_user = Endpoint( + self.delete_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -562,7 +562,7 @@ class UserApi(object): username return self.call_with_http_info(**kwargs) - self.get_user_by_name = Endpoint( + self.get_user_by_name = _Endpoint( settings={ 'response_type': (User,), 'auth': [], @@ -683,7 +683,7 @@ class UserApi(object): password return self.call_with_http_info(**kwargs) - self.login_user = Endpoint( + self.login_user = _Endpoint( settings={ 'response_type': (str,), 'auth': [], @@ -801,7 +801,7 @@ class UserApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.call_with_http_info(**kwargs) - self.logout_user = Endpoint( + self.logout_user = _Endpoint( settings={ 'response_type': None, 'auth': [], @@ -913,7 +913,7 @@ class UserApi(object): user return self.call_with_http_info(**kwargs) - self.update_user = Endpoint( + self.update_user = _Endpoint( settings={ 'response_type': None, 'auth': [], From 2b7ae4fa46c282a077339135fb7653b4ab1d4f8e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 Jan 2021 10:53:52 +0800 Subject: [PATCH 12/23] Consolidate 3rd item into the 4th item in PR template (#8428) * Consolidate 3rd item into the 4th item * minor change, use mvnw --- .github/PULL_REQUEST_TEMPLATE.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7f2e3d8d432c..1f9808ab5719 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,14 +5,12 @@ - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md). - [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community. -- [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand. -- [ ] Run +- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples: ``` - mvn clean package + ./mvnw clean package ./bin/generate-samples.sh ./bin/utils/export_docs_generators.sh ``` - to update all Petstore samples related to your fix. Commit all changed files. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. From 22ac8faec77a78f0a506ca582d98d157bf0fbf89 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 Jan 2021 13:59:21 +0800 Subject: [PATCH 13/23] Revert "[GO][Client] return GenericOpenAPIError instead of error in Execute() (#8137)" (#8427) This reverts commit 1562afea3980484a7f1819c4f51b0d53a44a009f. --- .../src/main/resources/go/api.mustache | 47 +-- .../src/main/resources/go/api_doc.mustache | 2 +- samples/client/petstore/go/auth_test.go | 32 +- samples/client/petstore/go/fake_api_test.go | 2 +- .../go/go-petstore/api_another_fake.go | 26 +- .../petstore/go/go-petstore/api_fake.go | 381 +++++++----------- .../go-petstore/api_fake_classname_tags123.go | 26 +- .../client/petstore/go/go-petstore/api_pet.go | 214 ++++------ .../petstore/go/go-petstore/api_store.go | 98 ++--- .../petstore/go/go-petstore/api_user.go | 195 ++++----- .../go/go-petstore/docs/AnotherFakeApi.md | 2 +- .../petstore/go/go-petstore/docs/FakeApi.md | 28 +- .../docs/FakeClassnameTags123Api.md | 2 +- .../petstore/go/go-petstore/docs/PetApi.md | 18 +- .../petstore/go/go-petstore/docs/StoreApi.md | 8 +- .../petstore/go/go-petstore/docs/UserApi.md | 16 +- .../client/petstore/go/mock/mock_api_pet.go | 36 +- samples/client/petstore/go/pet_api_test.go | 25 +- samples/client/petstore/go/store_api_test.go | 2 +- samples/client/petstore/go/user_api_test.go | 12 +- .../go-experimental/api_usage.go | 81 ++-- .../go-experimental/docs/UsageApi.md | 8 +- .../openapi3/client/petstore/go/auth_test.go | 32 +- .../client/petstore/go/fake_api_test.go | 2 +- .../go/go-petstore/api_another_fake.go | 26 +- .../petstore/go/go-petstore/api_default.go | 23 +- .../petstore/go/go-petstore/api_fake.go | 378 +++++++---------- .../go-petstore/api_fake_classname_tags123.go | 26 +- .../client/petstore/go/go-petstore/api_pet.go | 214 ++++------ .../petstore/go/go-petstore/api_store.go | 98 ++--- .../petstore/go/go-petstore/api_user.go | 195 ++++----- .../go/go-petstore/docs/AnotherFakeApi.md | 2 +- .../go/go-petstore/docs/DefaultApi.md | 2 +- .../petstore/go/go-petstore/docs/FakeApi.md | 28 +- .../docs/FakeClassnameTags123Api.md | 2 +- .../petstore/go/go-petstore/docs/PetApi.md | 18 +- .../petstore/go/go-petstore/docs/StoreApi.md | 8 +- .../petstore/go/go-petstore/docs/UserApi.md | 16 +- .../client/petstore/go/http_signature_test.go | 6 +- .../client/petstore/go/pet_api_test.go | 25 +- .../client/petstore/go/store_api_test.go | 2 +- .../client/petstore/go/user_api_test.go | 12 +- 42 files changed, 898 insertions(+), 1478 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache index 92c612347127..5486bde9dde0 100644 --- a/modules/openapi-generator/src/main/resources/go/api.mustache +++ b/modules/openapi-generator/src/main/resources/go/api.mustache @@ -3,7 +3,6 @@ package {{packageName}} {{#operations}} import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -36,7 +35,7 @@ type {{classname}} interface { * {{nickname}}Execute executes the request{{#returnType}} * @return {{{.}}}{{/returnType}} */ - {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, GenericOpenAPIError) + {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {{/operation}} } {{/generateInterfaces}} @@ -61,7 +60,7 @@ func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Reques return r }{{/isPathParam}}{{/allParams}} -func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, GenericOpenAPIError) { +func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) { return r.ApiService.{{nickname}}Execute(r) } @@ -86,14 +85,13 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParam * Execute executes the request{{#returnType}} * @return {{{.}}}{{/returnType}} */ -func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, GenericOpenAPIError) { +func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.Method{{httpMethod}} localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError {{#returnType}} localVarReturnValue {{{.}}} {{/returnType}} @@ -101,8 +99,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "{{{classname}}}Service.{{{nickname}}}") if err != nil { - executionError.error = err.Error() - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "{{{path}}}"{{#pathParams}} @@ -115,32 +112,27 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{#required}} {{^isPathParam}} if r.{{paramName}} == nil { - executionError.error = "{{paramName}} is required and must be specified" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} is required and must be specified") } {{/isPathParam}} {{#minItems}} if len({{^isPathParam}}*{{/isPathParam}}r.{{paramName}}) < {{minItems}} { - executionError.error = "{{paramName}} must have at least {{minItems}} elements" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must have at least {{minItems}} elements") } {{/minItems}} {{#maxItems}} if len({{^isPathParam}}*{{/isPathParam}}r.{{paramName}}) > {{maxItems}} { - executionError.error = "{{paramName}} must have less than {{maxItems}} elements" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must have less than {{maxItems}} elements") } {{/maxItems}} {{#minLength}} if strlen({{^isPathParam}}*{{/isPathParam}}r.{{paramName}}) < {{minLength}} { - executionError.error = "{{paramName}} must have at least {{minLength}} elements" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must have at least {{minLength}} elements") } {{/minLength}} {{#maxLength}} if strlen({{^isPathParam}}*{{/isPathParam}}r.{{paramName}}) > {{maxLength}} { - executionError.error = "{{paramName}} must have less than {{maxLength}} elements" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must have less than {{maxLength}} elements") } {{/maxLength}} {{#minimum}} @@ -151,8 +143,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{^isString}} if {{^isPathParam}}*{{/isPathParam}}r.{{paramName}} < {{minimum}} { {{/isString}} - executionError.error = "{{paramName}} must be greater than {{minimum}}" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must be greater than {{minimum}}") } {{/minimum}} {{#maximum}} @@ -163,8 +154,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{^isString}} if {{^isPathParam}}*{{/isPathParam}}r.{{paramName}} > {{maximum}} { {{/isString}} - executionError.error = "{{paramName}} must be less than {{maximum}}" - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must be less than {{maximum}}") } {{/maximum}} {{/required}} @@ -267,8 +257,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class if r.{{paramName}} != nil { paramJson, err := parameterToJson(*r.{{paramName}}) if err != nil { - executionError.error = err.Error() - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err } localVarFormParams.Add("{{baseName}}", paramJson) } @@ -323,22 +312,18 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class {{/authMethods}} req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return {{#returnType}}localVarReturnValue, {{/returnType}}nil, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -384,7 +369,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class } {{/returnType}} - return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, executionError + return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, nil } {{/operation}} {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/go/api_doc.mustache b/modules/openapi-generator/src/main/resources/go/api_doc.mustache index 1c7d3865ca19..458465f89476 100644 --- a/modules/openapi-generator/src/main/resources/go/api_doc.mustache +++ b/modules/openapi-generator/src/main/resources/go/api_doc.mustache @@ -43,7 +43,7 @@ func main() { configuration := {{goImportAlias}}.NewConfiguration() api_client := {{goImportAlias}}.NewAPIClient(configuration) resp, r, err := api_client.{{classname}}.{{operationId}}(context.Background(){{#pathParams}}, {{paramName}}{{/pathParams}}){{#allParams}}{{^isPathParam}}.{{vendorExtensions.x-export-param-name}}({{paramName}}){{/isPathParam}}{{/allParams}}.Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `{{classname}}.{{operationId}}``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/auth_test.go b/samples/client/petstore/go/auth_test.go index 8991f02a9b6f..0e532aeff3ac 100644 --- a/samples/client/petstore/go/auth_test.go +++ b/samples/client/petstore/go/auth_test.go @@ -43,7 +43,7 @@ func TestOAuth2(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -52,7 +52,7 @@ func TestOAuth2(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -78,7 +78,7 @@ func TestBasicAuth(t *testing.T) { r, err := client.PetApi.AddPet(auth).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -87,7 +87,7 @@ func TestBasicAuth(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -108,7 +108,7 @@ func TestAccessToken(t *testing.T) { r, err := client.PetApi.AddPet(nil).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -117,7 +117,7 @@ func TestAccessToken(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -138,7 +138,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -146,7 +146,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { } _, r, err = client.PetApi.GetPetById(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } @@ -156,7 +156,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { } r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -173,7 +173,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { r, err := client.PetApi.AddPet(nil).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -181,7 +181,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { } _, r, err = client.PetApi.GetPetById(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } @@ -191,7 +191,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { } r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -206,7 +206,7 @@ func TestDefaultHeader(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -215,7 +215,7 @@ func TestDefaultHeader(t *testing.T) { r, err = client.PetApi.DeletePet(context.Background(), 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -230,7 +230,7 @@ func TestDefaultHeader(t *testing.T) { func TestHostOverride(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while finding pets by status: %v", err) } @@ -242,7 +242,7 @@ func TestHostOverride(t *testing.T) { func TestSchemeOverride(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while finding pets by status: %v", err) } diff --git a/samples/client/petstore/go/fake_api_test.go b/samples/client/petstore/go/fake_api_test.go index 2de0ef77b2f9..d27137eeacfa 100644 --- a/samples/client/petstore/go/fake_api_test.go +++ b/samples/client/petstore/go/fake_api_test.go @@ -19,7 +19,7 @@ func TestPutBodyWithFileSchema(t *testing.T) { r, err := client.FakeApi.TestBodyWithFileSchema(context.Background()).Body(schema).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { diff --git a/samples/client/petstore/go/go-petstore/api_another_fake.go b/samples/client/petstore/go/go-petstore/api_another_fake.go index 01ed9905da7a..56c9345d5e32 100644 --- a/samples/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/client/petstore/go/go-petstore/api_another_fake.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type AnotherFakeApi interface { * Call123TestSpecialTagsExecute executes the request * @return Client */ - Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) } // AnotherFakeApiService AnotherFakeApi service @@ -54,7 +53,7 @@ func (r ApiCall123TestSpecialTagsRequest) Body(body Client) ApiCall123TestSpecia return r } -func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.Call123TestSpecialTagsExecute(r) } @@ -75,21 +74,19 @@ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) Api * Execute executes the request * @return Client */ -func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AnotherFakeApiService.Call123TestSpecialTags") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/another-fake/dummy" @@ -98,8 +95,7 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -123,22 +119,18 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -158,5 +150,5 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go index f6d890ebda39..92ef1bf22fcb 100644 --- a/samples/client/petstore/go/go-petstore/api_fake.go +++ b/samples/client/petstore/go/go-petstore/api_fake.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -39,7 +38,7 @@ type FakeApi interface { /* * CreateXmlItemExecute executes the request */ - CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, error) /* * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize @@ -53,7 +52,7 @@ type FakeApi interface { * FakeOuterBooleanSerializeExecute executes the request * @return bool */ - FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, GenericOpenAPIError) + FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) /* * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize @@ -67,7 +66,7 @@ type FakeApi interface { * FakeOuterCompositeSerializeExecute executes the request * @return OuterComposite */ - FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, GenericOpenAPIError) + FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) /* * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize @@ -81,7 +80,7 @@ type FakeApi interface { * FakeOuterNumberSerializeExecute executes the request * @return float32 */ - FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, GenericOpenAPIError) + FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) /* * FakeOuterStringSerialize Method for FakeOuterStringSerialize @@ -95,7 +94,7 @@ type FakeApi interface { * FakeOuterStringSerializeExecute executes the request * @return string */ - FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, GenericOpenAPIError) + FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) /* * TestBodyWithFileSchema Method for TestBodyWithFileSchema @@ -108,7 +107,7 @@ type FakeApi interface { /* * TestBodyWithFileSchemaExecute executes the request */ - TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, GenericOpenAPIError) + TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) /* * TestBodyWithQueryParams Method for TestBodyWithQueryParams @@ -120,7 +119,7 @@ type FakeApi interface { /* * TestBodyWithQueryParamsExecute executes the request */ - TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, GenericOpenAPIError) + TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) /* * TestClientModel To test \"client\" model @@ -134,7 +133,7 @@ type FakeApi interface { * TestClientModelExecute executes the request * @return Client */ - TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) /* * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -150,7 +149,7 @@ type FakeApi interface { /* * TestEndpointParametersExecute executes the request */ - TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) /* * TestEnumParameters To test enum parameters @@ -163,7 +162,7 @@ type FakeApi interface { /* * TestEnumParametersExecute executes the request */ - TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) /* * TestGroupParameters Fake endpoint to test group parameters (optional) @@ -176,7 +175,7 @@ type FakeApi interface { /* * TestGroupParametersExecute executes the request */ - TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) /* * TestInlineAdditionalProperties test inline additionalProperties @@ -188,7 +187,7 @@ type FakeApi interface { /* * TestInlineAdditionalPropertiesExecute executes the request */ - TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, GenericOpenAPIError) + TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) /* * TestJsonFormData test json serialization of form data @@ -200,7 +199,7 @@ type FakeApi interface { /* * TestJsonFormDataExecute executes the request */ - TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, GenericOpenAPIError) + TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) /* * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat @@ -213,7 +212,7 @@ type FakeApi interface { /* * TestQueryParameterCollectionFormatExecute executes the request */ - TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, GenericOpenAPIError) + TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) } // FakeApiService FakeApi service @@ -230,7 +229,7 @@ func (r ApiCreateXmlItemRequest) XmlItem(xmlItem XmlItem) ApiCreateXmlItemReques return r } -func (r ApiCreateXmlItemRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateXmlItemRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateXmlItemExecute(r) } @@ -250,20 +249,18 @@ func (a *FakeApiService) CreateXmlItem(ctx _context.Context) ApiCreateXmlItemReq /* * Execute executes the request */ -func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.CreateXmlItem") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/create_xml_item" @@ -272,8 +269,7 @@ func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_neth localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.xmlItem == nil { - executionError.error = "xmlItem is required and must be specified" - return nil, executionError + return nil, reportError("xmlItem is required and must be specified") } // to determine the Content-Type header @@ -297,22 +293,18 @@ func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_neth localVarPostBody = r.xmlItem req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -323,7 +315,7 @@ func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_neth return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiFakeOuterBooleanSerializeRequest struct { @@ -337,7 +329,7 @@ func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBoolean return r } -func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, error) { return r.ApiService.FakeOuterBooleanSerializeExecute(r) } @@ -358,21 +350,19 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFake * Execute executes the request * @return bool */ -func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue bool ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterBooleanSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/boolean" @@ -402,22 +392,18 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -437,7 +423,7 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterCompositeSerializeRequest struct { @@ -451,7 +437,7 @@ func (r ApiFakeOuterCompositeSerializeRequest) Body(body OuterComposite) ApiFake return r } -func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, error) { return r.ApiService.FakeOuterCompositeSerializeExecute(r) } @@ -472,21 +458,19 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFa * Execute executes the request * @return OuterComposite */ -func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue OuterComposite ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterCompositeSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/composite" @@ -516,22 +500,18 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -551,7 +531,7 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterNumberSerializeRequest struct { @@ -565,7 +545,7 @@ func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumbe return r } -func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, error) { return r.ApiService.FakeOuterNumberSerializeExecute(r) } @@ -586,21 +566,19 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeO * Execute executes the request * @return float32 */ -func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue float32 ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterNumberSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/number" @@ -630,22 +608,18 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -665,7 +639,7 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterStringSerializeRequest struct { @@ -679,7 +653,7 @@ func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterString return r } -func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, error) { return r.ApiService.FakeOuterStringSerializeExecute(r) } @@ -700,21 +674,19 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeO * Execute executes the request * @return string */ -func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue string ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterStringSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/string" @@ -744,22 +716,18 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -779,7 +747,7 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiTestBodyWithFileSchemaRequest struct { @@ -793,7 +761,7 @@ func (r ApiTestBodyWithFileSchemaRequest) Body(body FileSchemaTestClass) ApiTest return r } -func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestBodyWithFileSchemaExecute(r) } @@ -813,20 +781,18 @@ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBod /* * Execute executes the request */ -func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestBodyWithFileSchema") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/body-with-file-schema" @@ -835,8 +801,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -860,22 +825,18 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -886,7 +847,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestBodyWithQueryParamsRequest struct { @@ -905,7 +866,7 @@ func (r ApiTestBodyWithQueryParamsRequest) Body(body User) ApiTestBodyWithQueryP return r } -func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestBodyWithQueryParamsExecute(r) } @@ -924,20 +885,18 @@ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBo /* * Execute executes the request */ -func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestBodyWithQueryParams") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/body-with-query-params" @@ -946,12 +905,10 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.query == nil { - executionError.error = "query is required and must be specified" - return nil, executionError + return nil, reportError("query is required and must be specified") } if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } localVarQueryParams.Add("query", parameterToString(*r.query, "")) @@ -976,22 +933,18 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1002,7 +955,7 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestClientModelRequest struct { @@ -1016,7 +969,7 @@ func (r ApiTestClientModelRequest) Body(body Client) ApiTestClientModelRequest { return r } -func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.TestClientModelExecute(r) } @@ -1037,21 +990,19 @@ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientMode * Execute executes the request * @return Client */ -func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestClientModel") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1060,8 +1011,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -1085,22 +1035,18 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1120,7 +1066,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiTestEndpointParametersRequest struct { @@ -1199,7 +1145,7 @@ func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpo return r } -func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestEndpointParametersExecute(r) } @@ -1222,20 +1168,18 @@ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEnd /* * Execute executes the request */ -func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestEndpointParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1244,36 +1188,28 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.number == nil { - executionError.error = "number is required and must be specified" - return nil, executionError + return nil, reportError("number is required and must be specified") } if *r.number < 32.1 { - executionError.error = "number must be greater than 32.1" - return nil, executionError + return nil, reportError("number must be greater than 32.1") } if *r.number > 543.2 { - executionError.error = "number must be less than 543.2" - return nil, executionError + return nil, reportError("number must be less than 543.2") } if r.double == nil { - executionError.error = "double is required and must be specified" - return nil, executionError + return nil, reportError("double is required and must be specified") } if *r.double < 67.8 { - executionError.error = "double must be greater than 67.8" - return nil, executionError + return nil, reportError("double must be greater than 67.8") } if *r.double > 123.4 { - executionError.error = "double must be less than 123.4" - return nil, executionError + return nil, reportError("double must be less than 123.4") } if r.patternWithoutDelimiter == nil { - executionError.error = "patternWithoutDelimiter is required and must be specified" - return nil, executionError + return nil, reportError("patternWithoutDelimiter is required and must be specified") } if r.byte_ == nil { - executionError.error = "byte_ is required and must be specified" - return nil, executionError + return nil, reportError("byte_ is required and must be specified") } // to determine the Content-Type header @@ -1337,22 +1273,18 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1363,7 +1295,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestEnumParametersRequest struct { @@ -1412,7 +1344,7 @@ func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiT return r } -func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestEnumParametersExecute(r) } @@ -1432,20 +1364,18 @@ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumPar /* * Execute executes the request */ -func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestEnumParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1497,22 +1427,18 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1523,7 +1449,7 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestGroupParametersRequest struct { @@ -1562,7 +1488,7 @@ func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroup return r } -func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestGroupParametersExecute(r) } @@ -1582,20 +1508,18 @@ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupP /* * Execute executes the request */ -func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestGroupParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1604,16 +1528,13 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.requiredStringGroup == nil { - executionError.error = "requiredStringGroup is required and must be specified" - return nil, executionError + return nil, reportError("requiredStringGroup is required and must be specified") } if r.requiredBooleanGroup == nil { - executionError.error = "requiredBooleanGroup is required and must be specified" - return nil, executionError + return nil, reportError("requiredBooleanGroup is required and must be specified") } if r.requiredInt64Group == nil { - executionError.error = "requiredInt64Group is required and must be specified" - return nil, executionError + return nil, reportError("requiredInt64Group is required and must be specified") } localVarQueryParams.Add("required_string_group", parameterToString(*r.requiredStringGroup, "")) @@ -1647,22 +1568,18 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1673,7 +1590,7 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestInlineAdditionalPropertiesRequest struct { @@ -1687,7 +1604,7 @@ func (r ApiTestInlineAdditionalPropertiesRequest) Param(param map[string]string) return r } -func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestInlineAdditionalPropertiesExecute(r) } @@ -1706,20 +1623,18 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) Ap /* * Execute executes the request */ -func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestInlineAdditionalProperties") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/inline-additionalProperties" @@ -1728,8 +1643,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.param == nil { - executionError.error = "param is required and must be specified" - return nil, executionError + return nil, reportError("param is required and must be specified") } // to determine the Content-Type header @@ -1753,22 +1667,18 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarPostBody = r.param req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1779,7 +1689,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestJsonFormDataRequest struct { @@ -1798,7 +1708,7 @@ func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataReq return r } -func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestJsonFormDataExecute(r) } @@ -1817,20 +1727,18 @@ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormD /* * Execute executes the request */ -func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestJsonFormData") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/jsonFormData" @@ -1839,12 +1747,10 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.param == nil { - executionError.error = "param is required and must be specified" - return nil, executionError + return nil, reportError("param is required and must be specified") } if r.param2 == nil { - executionError.error = "param2 is required and must be specified" - return nil, executionError + return nil, reportError("param2 is required and must be specified") } // to determine the Content-Type header @@ -1868,22 +1774,18 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarFormParams.Add("param2", parameterToString(*r.param2, "")) req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1894,7 +1796,7 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestQueryParameterCollectionFormatRequest struct { @@ -1928,7 +1830,7 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Context(context []string) return r } -func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestQueryParameterCollectionFormatExecute(r) } @@ -1948,20 +1850,18 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context /* * Execute executes the request */ -func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestQueryParameterCollectionFormat") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/test-query-paramters" @@ -1970,24 +1870,19 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.pipe == nil { - executionError.error = "pipe is required and must be specified" - return nil, executionError + return nil, reportError("pipe is required and must be specified") } if r.ioutil == nil { - executionError.error = "ioutil is required and must be specified" - return nil, executionError + return nil, reportError("ioutil is required and must be specified") } if r.http == nil { - executionError.error = "http is required and must be specified" - return nil, executionError + return nil, reportError("http is required and must be specified") } if r.url == nil { - executionError.error = "url is required and must be specified" - return nil, executionError + return nil, reportError("url is required and must be specified") } if r.context == nil { - executionError.error = "context is required and must be specified" - return nil, executionError + return nil, reportError("context is required and must be specified") } localVarQueryParams.Add("pipe", parameterToString(*r.pipe, "csv")) @@ -2024,22 +1919,18 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -2050,5 +1941,5 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go index a935409c5578..c032657de757 100644 --- a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type FakeClassnameTags123Api interface { * TestClassnameExecute executes the request * @return Client */ - TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) } // FakeClassnameTags123ApiService FakeClassnameTags123Api service @@ -54,7 +53,7 @@ func (r ApiTestClassnameRequest) Body(body Client) ApiTestClassnameRequest { return r } -func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.TestClassnameExecute(r) } @@ -75,21 +74,19 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) Api * Execute executes the request * @return Client */ -func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeClassnameTags123ApiService.TestClassname") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake_classname_test" @@ -98,8 +95,7 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -137,22 +133,18 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -172,5 +164,5 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go index 48f83426726e..da68df83dda0 100644 --- a/samples/client/petstore/go/go-petstore/api_pet.go +++ b/samples/client/petstore/go/go-petstore/api_pet.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type PetApi interface { /* * AddPetExecute executes the request */ - AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, GenericOpenAPIError) + AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) /* * DeletePet Deletes a pet @@ -50,7 +49,7 @@ type PetApi interface { /* * DeletePetExecute executes the request */ - DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, GenericOpenAPIError) + DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) /* * FindPetsByStatus Finds Pets by status @@ -64,7 +63,7 @@ type PetApi interface { * FindPetsByStatusExecute executes the request * @return []Pet */ - FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) + FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) /* * FindPetsByTags Finds Pets by tags @@ -78,7 +77,7 @@ type PetApi interface { * FindPetsByTagsExecute executes the request * @return []Pet */ - FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) + FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) /* * GetPetById Find pet by ID @@ -93,7 +92,7 @@ type PetApi interface { * GetPetByIdExecute executes the request * @return Pet */ - GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, GenericOpenAPIError) + GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) /* * UpdatePet Update an existing pet @@ -105,7 +104,7 @@ type PetApi interface { /* * UpdatePetExecute executes the request */ - UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) /* * UpdatePetWithForm Updates a pet in the store with form data @@ -118,7 +117,7 @@ type PetApi interface { /* * UpdatePetWithFormExecute executes the request */ - UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) /* * UploadFile uploads an image @@ -132,7 +131,7 @@ type PetApi interface { * UploadFileExecute executes the request * @return ApiResponse */ - UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) + UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) /* * UploadFileWithRequiredFile uploads an image (required) @@ -146,7 +145,7 @@ type PetApi interface { * UploadFileWithRequiredFileExecute executes the request * @return ApiResponse */ - UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) + UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) } // PetApiService PetApi service @@ -163,7 +162,7 @@ func (r ApiAddPetRequest) Body(body Pet) ApiAddPetRequest { return r } -func (r ApiAddPetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.AddPetExecute(r) } @@ -182,20 +181,18 @@ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { /* * Execute executes the request */ -func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.AddPet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet" @@ -204,8 +201,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -229,22 +225,18 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -255,7 +247,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiDeletePetRequest struct { @@ -270,7 +262,7 @@ func (r ApiDeletePetRequest) ApiKey(apiKey string) ApiDeletePetRequest { return r } -func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeletePetExecute(r) } @@ -291,20 +283,18 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePe /* * Execute executes the request */ -func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.DeletePet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -336,22 +326,18 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -362,7 +348,7 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiFindPetsByStatusRequest struct { @@ -376,7 +362,7 @@ func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusR return r } -func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) { return r.ApiService.FindPetsByStatusExecute(r) } @@ -397,21 +383,19 @@ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStat * Execute executes the request * @return []Pet */ -func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue []Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.FindPetsByStatus") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/findByStatus" @@ -420,8 +404,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.status == nil { - executionError.error = "status is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("status is required and must be specified") } localVarQueryParams.Add("status", parameterToString(*r.status, "csv")) @@ -444,22 +427,18 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -479,7 +458,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFindPetsByTagsRequest struct { @@ -493,7 +472,7 @@ func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest { return r } -func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) { return r.ApiService.FindPetsByTagsExecute(r) } @@ -514,21 +493,19 @@ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRe * Execute executes the request * @return []Pet */ -func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue []Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.FindPetsByTags") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/findByTags" @@ -537,8 +514,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.tags == nil { - executionError.error = "tags is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("tags is required and must be specified") } localVarQueryParams.Add("tags", parameterToString(*r.tags, "csv")) @@ -561,22 +537,18 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -596,7 +568,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiGetPetByIdRequest struct { @@ -606,7 +578,7 @@ type ApiGetPetByIdRequest struct { } -func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) { return r.ApiService.GetPetByIdExecute(r) } @@ -629,21 +601,19 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetB * Execute executes the request * @return Pet */ -func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.GetPetById") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -686,22 +656,18 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -721,7 +687,7 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiUpdatePetRequest struct { @@ -735,7 +701,7 @@ func (r ApiUpdatePetRequest) Body(body Pet) ApiUpdatePetRequest { return r } -func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdatePetExecute(r) } @@ -754,20 +720,18 @@ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { /* * Execute executes the request */ -func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UpdatePet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet" @@ -776,8 +740,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -801,22 +764,18 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -827,7 +786,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUpdatePetWithFormRequest struct { @@ -847,7 +806,7 @@ func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormR return r } -func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdatePetWithFormExecute(r) } @@ -868,20 +827,18 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) Api /* * Execute executes the request */ -func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UpdatePetWithForm") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -916,22 +873,18 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -942,7 +895,7 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUploadFileRequest struct { @@ -962,7 +915,7 @@ func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest { return r } -func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) { return r.ApiService.UploadFileExecute(r) } @@ -984,21 +937,19 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadF * Execute executes the request * @return ApiResponse */ -func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue ApiResponse ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UploadFile") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}/uploadImage" @@ -1041,22 +992,18 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1076,7 +1023,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiUploadFileWithRequiredFileRequest struct { @@ -1096,7 +1043,7 @@ func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetad return r } -func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) { return r.ApiService.UploadFileWithRequiredFileExecute(r) } @@ -1118,21 +1065,19 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i * Execute executes the request * @return ApiResponse */ -func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue ApiResponse ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UploadFileWithRequiredFile") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/{petId}/uploadImageWithRequiredFile" @@ -1142,8 +1087,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.requiredFile == nil { - executionError.error = "requiredFile is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("requiredFile is required and must be specified") } // to determine the Content-Type header @@ -1176,22 +1120,18 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1211,5 +1151,5 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go index 14554938b47b..0b5853274dd6 100644 --- a/samples/client/petstore/go/go-petstore/api_store.go +++ b/samples/client/petstore/go/go-petstore/api_store.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -38,7 +37,7 @@ type StoreApi interface { /* * DeleteOrderExecute executes the request */ - DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, GenericOpenAPIError) + DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) /* * GetInventory Returns pet inventories by status @@ -52,7 +51,7 @@ type StoreApi interface { * GetInventoryExecute executes the request * @return map[string]int32 */ - GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, GenericOpenAPIError) + GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) /* * GetOrderById Find purchase order by ID @@ -67,7 +66,7 @@ type StoreApi interface { * GetOrderByIdExecute executes the request * @return Order */ - GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, GenericOpenAPIError) + GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) /* * PlaceOrder Place an order for a pet @@ -80,7 +79,7 @@ type StoreApi interface { * PlaceOrderExecute executes the request * @return Order */ - PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, GenericOpenAPIError) + PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) } // StoreApiService StoreApi service @@ -93,7 +92,7 @@ type ApiDeleteOrderRequest struct { } -func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeleteOrderExecute(r) } @@ -115,20 +114,18 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiD /* * Execute executes the request */ -func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.DeleteOrder") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order/{order_id}" @@ -157,22 +154,18 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -183,7 +176,7 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiGetInventoryRequest struct { @@ -192,7 +185,7 @@ type ApiGetInventoryRequest struct { } -func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, error) { return r.ApiService.GetInventoryExecute(r) } @@ -213,21 +206,19 @@ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequ * Execute executes the request * @return map[string]int32 */ -func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]int32 ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.GetInventory") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/inventory" @@ -269,22 +260,18 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -304,7 +291,7 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiGetOrderByIdRequest struct { @@ -314,7 +301,7 @@ type ApiGetOrderByIdRequest struct { } -func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) { return r.ApiService.GetOrderByIdExecute(r) } @@ -337,21 +324,19 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiG * Execute executes the request * @return Order */ -func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Order ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.GetOrderById") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order/{order_id}" @@ -361,12 +346,10 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.orderId < 1 { - executionError.error = "orderId must be greater than 1" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("orderId must be greater than 1") } if r.orderId > 5 { - executionError.error = "orderId must be less than 5" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("orderId must be less than 5") } // to determine the Content-Type header @@ -388,22 +371,18 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -423,7 +402,7 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiPlaceOrderRequest struct { @@ -437,7 +416,7 @@ func (r ApiPlaceOrderRequest) Body(body Order) ApiPlaceOrderRequest { return r } -func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) { return r.ApiService.PlaceOrderExecute(r) } @@ -457,21 +436,19 @@ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest * Execute executes the request * @return Order */ -func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Order ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.PlaceOrder") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order" @@ -480,8 +457,7 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -505,22 +481,18 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -540,5 +512,5 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/api_user.go b/samples/client/petstore/go/go-petstore/api_user.go index e4c0eaeef16c..6f8185f704bd 100644 --- a/samples/client/petstore/go/go-petstore/api_user.go +++ b/samples/client/petstore/go/go-petstore/api_user.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type UserApi interface { /* * CreateUserExecute executes the request */ - CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) /* * CreateUsersWithArrayInput Creates list of users with given input array @@ -49,7 +48,7 @@ type UserApi interface { /* * CreateUsersWithArrayInputExecute executes the request */ - CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) /* * CreateUsersWithListInput Creates list of users with given input array @@ -61,7 +60,7 @@ type UserApi interface { /* * CreateUsersWithListInputExecute executes the request */ - CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) /* * DeleteUser Delete user @@ -75,7 +74,7 @@ type UserApi interface { /* * DeleteUserExecute executes the request */ - DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, GenericOpenAPIError) + DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) /* * GetUserByName Get user by user name @@ -89,7 +88,7 @@ type UserApi interface { * GetUserByNameExecute executes the request * @return User */ - GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, GenericOpenAPIError) + GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) /* * LoginUser Logs user into the system @@ -102,7 +101,7 @@ type UserApi interface { * LoginUserExecute executes the request * @return string */ - LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, GenericOpenAPIError) + LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) /* * LogoutUser Logs out current logged in user session @@ -114,7 +113,7 @@ type UserApi interface { /* * LogoutUserExecute executes the request */ - LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, GenericOpenAPIError) + LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) /* * UpdateUser Updated user @@ -128,7 +127,7 @@ type UserApi interface { /* * UpdateUserExecute executes the request */ - UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) } // UserApiService UserApi service @@ -145,7 +144,7 @@ func (r ApiCreateUserRequest) Body(body User) ApiCreateUserRequest { return r } -func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUserExecute(r) } @@ -165,20 +164,18 @@ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { /* * Execute executes the request */ -func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user" @@ -187,8 +184,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -212,22 +208,18 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -238,7 +230,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiCreateUsersWithArrayInputRequest struct { @@ -252,7 +244,7 @@ func (r ApiCreateUsersWithArrayInputRequest) Body(body []User) ApiCreateUsersWit return r } -func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUsersWithArrayInputExecute(r) } @@ -271,20 +263,18 @@ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCrea /* * Execute executes the request */ -func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUsersWithArrayInput") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/createWithArray" @@ -293,8 +283,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -318,22 +307,18 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -344,7 +329,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiCreateUsersWithListInputRequest struct { @@ -358,7 +343,7 @@ func (r ApiCreateUsersWithListInputRequest) Body(body []User) ApiCreateUsersWith return r } -func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUsersWithListInputExecute(r) } @@ -377,20 +362,18 @@ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreat /* * Execute executes the request */ -func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUsersWithListInput") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/createWithList" @@ -399,8 +382,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -424,22 +406,18 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -450,7 +428,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiDeleteUserRequest struct { @@ -460,7 +438,7 @@ type ApiDeleteUserRequest struct { } -func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeleteUserExecute(r) } @@ -482,20 +460,18 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDe /* * Execute executes the request */ -func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.DeleteUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -524,22 +500,18 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -550,7 +522,7 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiGetUserByNameRequest struct { @@ -560,7 +532,7 @@ type ApiGetUserByNameRequest struct { } -func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) { return r.ApiService.GetUserByNameExecute(r) } @@ -582,21 +554,19 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) Ap * Execute executes the request * @return User */ -func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue User ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.GetUserByName") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -625,22 +595,18 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -660,7 +626,7 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiLoginUserRequest struct { @@ -679,7 +645,7 @@ func (r ApiLoginUserRequest) Password(password string) ApiLoginUserRequest { return r } -func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, error) { return r.ApiService.LoginUserExecute(r) } @@ -699,21 +665,19 @@ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { * Execute executes the request * @return string */ -func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue string ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.LoginUser") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/login" @@ -722,12 +686,10 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.username == nil { - executionError.error = "username is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("username is required and must be specified") } if r.password == nil { - executionError.error = "password is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("password is required and must be specified") } localVarQueryParams.Add("username", parameterToString(*r.username, "")) @@ -751,22 +713,18 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -786,7 +744,7 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiLogoutUserRequest struct { @@ -795,7 +753,7 @@ type ApiLogoutUserRequest struct { } -func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.LogoutUserExecute(r) } @@ -814,20 +772,18 @@ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { /* * Execute executes the request */ -func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.LogoutUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/logout" @@ -855,22 +811,18 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -881,7 +833,7 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUpdateUserRequest struct { @@ -896,7 +848,7 @@ func (r ApiUpdateUserRequest) Body(body User) ApiUpdateUserRequest { return r } -func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdateUserExecute(r) } @@ -918,20 +870,18 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUp /* * Execute executes the request */ -func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.UpdateUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -941,8 +891,7 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.body == nil { - executionError.error = "body is required and must be specified" - return nil, executionError + return nil, reportError("body is required and must be specified") } // to determine the Content-Type header @@ -966,22 +915,18 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -992,5 +937,5 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } diff --git a/samples/client/petstore/go/go-petstore/docs/AnotherFakeApi.md b/samples/client/petstore/go/go-petstore/docs/AnotherFakeApi.md index 5a40763d89a1..6243abe3c4d7 100644 --- a/samples/client/petstore/go/go-petstore/docs/AnotherFakeApi.md +++ b/samples/client/petstore/go/go-petstore/docs/AnotherFakeApi.md @@ -34,7 +34,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.AnotherFakeApi.Call123TestSpecialTags(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `AnotherFakeApi.Call123TestSpecialTags``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/client/petstore/go/go-petstore/docs/FakeApi.md index b64acb3da74c..382058dc4db3 100644 --- a/samples/client/petstore/go/go-petstore/docs/FakeApi.md +++ b/samples/client/petstore/go/go-petstore/docs/FakeApi.md @@ -47,7 +47,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.CreateXmlItem(context.Background()).XmlItem(xmlItem).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.CreateXmlItem``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -111,7 +111,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterBooleanSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterBooleanSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -177,7 +177,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterCompositeSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterCompositeSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -243,7 +243,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterNumberSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterNumberSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -309,7 +309,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterStringSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterStringSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -375,7 +375,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestBodyWithFileSchema(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestBodyWithFileSchema``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -438,7 +438,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestBodyWithQueryParams(context.Background()).Query(query).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestBodyWithQueryParams``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -503,7 +503,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestClientModel(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestClientModel``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -583,7 +583,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestEndpointParameters(context.Background()).Number(number).Double(double).PatternWithoutDelimiter(patternWithoutDelimiter).Byte_(byte_).Integer(integer).Int32_(int32_).Int64_(int64_).Float(float).String_(string_).Binary(binary).Date(date).DateTime(dateTime).Password(password).Callback(callback).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestEndpointParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -667,7 +667,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestEnumParameters(context.Background()).EnumHeaderStringArray(enumHeaderStringArray).EnumHeaderString(enumHeaderString).EnumQueryStringArray(enumQueryStringArray).EnumQueryString(enumQueryString).EnumQueryInteger(enumQueryInteger).EnumQueryDouble(enumQueryDouble).EnumFormStringArray(enumFormStringArray).EnumFormString(enumFormString).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestEnumParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -743,7 +743,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestGroupParameters(context.Background()).RequiredStringGroup(requiredStringGroup).RequiredBooleanGroup(requiredBooleanGroup).RequiredInt64Group(requiredInt64Group).StringGroup(stringGroup).BooleanGroup(booleanGroup).Int64Group(int64Group).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestGroupParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -810,7 +810,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestInlineAdditionalProperties(context.Background()).Param(param).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestInlineAdditionalProperties``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -873,7 +873,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestJsonFormData(context.Background()).Param(param).Param2(param2).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestJsonFormData``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -942,7 +942,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestQueryParameterCollectionFormat(context.Background()).Pipe(pipe).Ioutil(ioutil).Http(http).Url(url).Context(context).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestQueryParameterCollectionFormat``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md b/samples/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md index ac3040d4b469..b206d05d09c7 100644 --- a/samples/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md +++ b/samples/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md @@ -34,7 +34,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeClassnameTags123Api.TestClassname(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeClassnameTags123Api.TestClassname``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/go-petstore/docs/PetApi.md b/samples/client/petstore/go/go-petstore/docs/PetApi.md index 7ded65ebcaec..d93265c16ed7 100644 --- a/samples/client/petstore/go/go-petstore/docs/PetApi.md +++ b/samples/client/petstore/go/go-petstore/docs/PetApi.md @@ -40,7 +40,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.AddPet(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.AddPet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -103,7 +103,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.DeletePet(context.Background(), petId).ApiKey(apiKey).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.DeletePet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -172,7 +172,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.FindPetsByStatus(context.Background()).Status(status).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.FindPetsByStatus``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -238,7 +238,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.FindPetsByTags(context.Background()).Tags(tags).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.FindPetsByTags``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -304,7 +304,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.GetPetById(context.Background(), petId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.GetPetById``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -372,7 +372,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UpdatePet(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UpdatePet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -436,7 +436,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UpdatePetWithForm(context.Background(), petId).Name(name).Status(status).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UpdatePetWithForm``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -506,7 +506,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UploadFile(context.Background(), petId).AdditionalMetadata(additionalMetadata).File(file).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UploadFile``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -578,7 +578,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UploadFileWithRequiredFile(context.Background(), petId).RequiredFile(requiredFile).AdditionalMetadata(additionalMetadata).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UploadFileWithRequiredFile``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/go-petstore/docs/StoreApi.md b/samples/client/petstore/go/go-petstore/docs/StoreApi.md index c97d2ab643c8..1e5c0ae5ba82 100644 --- a/samples/client/petstore/go/go-petstore/docs/StoreApi.md +++ b/samples/client/petstore/go/go-petstore/docs/StoreApi.md @@ -37,7 +37,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.DeleteOrder(context.Background(), orderId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.DeleteOrder``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -104,7 +104,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.GetInventory(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.GetInventory``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -166,7 +166,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.GetOrderById(context.Background(), orderId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.GetOrderById``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -234,7 +234,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.PlaceOrder(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.PlaceOrder``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/go-petstore/docs/UserApi.md b/samples/client/petstore/go/go-petstore/docs/UserApi.md index 712e0de87dee..e1623fabec46 100644 --- a/samples/client/petstore/go/go-petstore/docs/UserApi.md +++ b/samples/client/petstore/go/go-petstore/docs/UserApi.md @@ -41,7 +41,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUser(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -103,7 +103,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUsersWithArrayInput(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUsersWithArrayInput``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -165,7 +165,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUsersWithListInput(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUsersWithListInput``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -229,7 +229,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.DeleteUser(context.Background(), username).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.DeleteUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -295,7 +295,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.GetUserByName(context.Background(), username).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.GetUserByName``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -364,7 +364,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.LoginUser(context.Background()).Username(username).Password(password).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.LoginUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -428,7 +428,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.LogoutUser(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.LogoutUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -489,7 +489,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.UpdateUser(context.Background(), username).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.UpdateUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/client/petstore/go/mock/mock_api_pet.go b/samples/client/petstore/go/mock/mock_api_pet.go index 3828c3bb7722..84686bb5f2e5 100644 --- a/samples/client/petstore/go/mock/mock_api_pet.go +++ b/samples/client/petstore/go/mock/mock_api_pet.go @@ -20,70 +20,70 @@ func (m *MockPetApi) AddPet(ctx context.Context) sw.ApiAddPetRequest { return sw.ApiAddPetRequest{ApiService: m} } -func (m *MockPetApi) AddPetExecute(r sw.ApiAddPetRequest) (*http.Response, sw.GenericOpenAPIError) { - return &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) AddPetExecute(r sw.ApiAddPetRequest) (*http.Response, error) { + return &http.Response{StatusCode:200}, nil } func (m *MockPetApi) DeletePet(ctx context.Context, petId int64) sw.ApiDeletePetRequest { return sw.ApiDeletePetRequest{ApiService: m} } -func (m *MockPetApi) DeletePetExecute(r sw.ApiDeletePetRequest) (*http.Response, sw.GenericOpenAPIError) { - return &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) DeletePetExecute(r sw.ApiDeletePetRequest) (*http.Response, error) { + return &http.Response{StatusCode:200}, nil } func (m *MockPetApi) FindPetsByStatus(ctx context.Context) sw.ApiFindPetsByStatusRequest { return sw.ApiFindPetsByStatusRequest{ApiService: m} } -func (m *MockPetApi) FindPetsByStatusExecute(r sw.ApiFindPetsByStatusRequest) ([]sw.Pet, *http.Response, sw.GenericOpenAPIError) { - return []sw.Pet{}, &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) FindPetsByStatusExecute(r sw.ApiFindPetsByStatusRequest) ([]sw.Pet, *http.Response, error) { + return []sw.Pet{}, &http.Response{StatusCode:200}, nil } func (m *MockPetApi) FindPetsByTags(ctx context.Context) sw.ApiFindPetsByTagsRequest { return sw.ApiFindPetsByTagsRequest{ApiService: m} } -func (m *MockPetApi) FindPetsByTagsExecute(r sw.ApiFindPetsByTagsRequest) ([]sw.Pet, *http.Response, sw.GenericOpenAPIError) { - return []sw.Pet{}, &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) FindPetsByTagsExecute(r sw.ApiFindPetsByTagsRequest) ([]sw.Pet, *http.Response, error) { + return []sw.Pet{}, &http.Response{StatusCode:200}, nil } func (m *MockPetApi) GetPetById(ctx context.Context, petId int64) sw.ApiGetPetByIdRequest { return sw.ApiGetPetByIdRequest{ApiService: m} } -func (m *MockPetApi) GetPetByIdExecute(r sw.ApiGetPetByIdRequest) (sw.Pet, *http.Response, sw.GenericOpenAPIError) { - return sw.Pet{}, &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) GetPetByIdExecute(r sw.ApiGetPetByIdRequest) (sw.Pet, *http.Response, error) { + return sw.Pet{}, &http.Response{StatusCode:200}, nil } func (m *MockPetApi) UpdatePet(ctx context.Context) sw.ApiUpdatePetRequest { return sw.ApiUpdatePetRequest{ApiService: m} } -func (m *MockPetApi) UpdatePetExecute(r sw.ApiUpdatePetRequest) (*http.Response, sw.GenericOpenAPIError) { - return &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) UpdatePetExecute(r sw.ApiUpdatePetRequest) (*http.Response, error) { + return &http.Response{StatusCode:200}, nil } func (m *MockPetApi) UpdatePetWithForm(ctx context.Context, petId int64) sw.ApiUpdatePetWithFormRequest { return sw.ApiUpdatePetWithFormRequest{ApiService: m} } -func (m *MockPetApi) UpdatePetWithFormExecute(r sw.ApiUpdatePetWithFormRequest) (*http.Response, sw.GenericOpenAPIError) { - return &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) UpdatePetWithFormExecute(r sw.ApiUpdatePetWithFormRequest) (*http.Response, error) { + return &http.Response{StatusCode:200}, nil } func (m *MockPetApi) UploadFile(ctx context.Context, petId int64) sw.ApiUploadFileRequest { return sw.ApiUploadFileRequest{ApiService: m} } -func (m *MockPetApi) UploadFileExecute(r sw.ApiUploadFileRequest) (sw.ApiResponse, *http.Response, sw.GenericOpenAPIError) { - return sw.ApiResponse{}, &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) UploadFileExecute(r sw.ApiUploadFileRequest) (sw.ApiResponse, *http.Response, error) { + return sw.ApiResponse{}, &http.Response{StatusCode:200}, nil } func (m *MockPetApi) UploadFileWithRequiredFile(ctx context.Context, petId int64) sw.ApiUploadFileWithRequiredFileRequest { return sw.ApiUploadFileWithRequiredFileRequest{ApiService: m} } -func (m *MockPetApi) UploadFileWithRequiredFileExecute(r sw.ApiUploadFileWithRequiredFileRequest) (sw.ApiResponse, *http.Response, sw.GenericOpenAPIError) { - return sw.ApiResponse{}, &http.Response{StatusCode:200}, sw.GenericOpenAPIError{} +func (m *MockPetApi) UploadFileWithRequiredFileExecute(r sw.ApiUploadFileWithRequiredFileRequest) (sw.ApiResponse, *http.Response, error) { + return sw.ApiResponse{}, &http.Response{StatusCode:200}, nil } diff --git a/samples/client/petstore/go/pet_api_test.go b/samples/client/petstore/go/pet_api_test.go index f241e8a90196..0868c4b96ccb 100644 --- a/samples/client/petstore/go/pet_api_test.go +++ b/samples/client/petstore/go/pet_api_test.go @@ -34,7 +34,7 @@ func TestAddPet(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Body(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -54,7 +54,7 @@ func TestAddPetMock(t *testing.T) { func TestFindPetsByStatusWithMissingParam(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while testing TestFindPetsByStatusWithMissingParam: %v", err) } if r.StatusCode != 200 { @@ -69,12 +69,13 @@ func TestGetPetById(t *testing.T) { func TestGetPetByIdWithInvalidID(t *testing.T) { resp, r, err := client.PetApi.GetPetById(context.Background(), 999999999).Execute() if r != nil && r.StatusCode == 404 { - assertedError := err + assertedError, ok := err.(sw.GenericOpenAPIError) a := assert.New(t) + a.True(ok) a.Contains(string(assertedError.Body()), "type") a.Contains(assertedError.Error(), "Not Found") - } else if err.Error() != "" { + } else if err != nil { t.Fatalf("Error while getting pet by invalid id: %v", err) t.Log(r) } else { @@ -84,7 +85,7 @@ func TestGetPetByIdWithInvalidID(t *testing.T) { func TestUpdatePetWithForm(t *testing.T) { r, err := client.PetApi.UpdatePetWithForm(context.Background(), 12830).Name("golang").Status("available").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while updating pet by id: %v", err) t.Log(r) } @@ -99,7 +100,7 @@ func TestUpdatePetWithForm(t *testing.T) { func TestFindPetsByTag(t *testing.T) { var found = false resp, r, err := client.PetApi.FindPetsByTags(context.Background()).Tags([]string{"tag2"}).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by tag: %v", err) t.Log(r) } else { @@ -128,7 +129,7 @@ func TestFindPetsByTag(t *testing.T) { func TestFindPetsByStatus(t *testing.T) { resp, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status([]string{"available"}).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by id: %v", err) t.Log(r) } else { @@ -155,7 +156,7 @@ func TestUploadFile(t *testing.T) { _, r, err := client.PetApi.UploadFile(context.Background(), 12830).AdditionalMetadata("golang").File(file).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while uploading file: %v", err) } @@ -173,7 +174,7 @@ func TestUploadFileRequired(t *testing.T) { _, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830).RequiredFile(file).AdditionalMetadata("golang").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while uploading file: %v", err) } @@ -185,7 +186,7 @@ func TestUploadFileRequired(t *testing.T) { func TestDeletePet(t *testing.T) { r, err := client.PetApi.DeletePet(context.Background(), 12830).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -275,7 +276,7 @@ func waitOnFunctions(t *testing.T, errc chan error, n int) { func deletePet(t *testing.T, id int64) { r, err := client.PetApi.DeletePet(context.Background(), id).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -286,7 +287,7 @@ func deletePet(t *testing.T, id int64) { func isPetCorrect(t *testing.T, id int64, name string, status string) { assert := assert.New(t) resp, r, err := client.PetApi.GetPetById(context.Background(), id).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by id: %v", err) } else { assert.Equal(*resp.Id, int64(id), "Pet id should be equal") diff --git a/samples/client/petstore/go/store_api_test.go b/samples/client/petstore/go/store_api_test.go index ea97848fe1db..f9f55273eb92 100644 --- a/samples/client/petstore/go/store_api_test.go +++ b/samples/client/petstore/go/store_api_test.go @@ -20,7 +20,7 @@ func TestPlaceOrder(t *testing.T) { _, r, err := client.StoreApi.PlaceOrder(context.Background()).Body(newOrder).Execute() - if err.Error() != "" { + if err != nil { // Skip parsing time error due to error in Petstore Test Server // https://github.com/OpenAPITools/openapi-generator/issues/1292 if regexp. diff --git a/samples/client/petstore/go/user_api_test.go b/samples/client/petstore/go/user_api_test.go index d7329bed49ec..361e77ac9aa7 100644 --- a/samples/client/petstore/go/user_api_test.go +++ b/samples/client/petstore/go/user_api_test.go @@ -22,7 +22,7 @@ func TestCreateUser(t *testing.T) { apiResponse, err := client.UserApi.CreateUser(context.Background()).Body(newUser).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding user: %v", err) } if apiResponse.StatusCode != 200 { @@ -56,7 +56,7 @@ func TestCreateUsersWithArrayInput(t *testing.T) { } apiResponse, err := client.UserApi.CreateUsersWithArrayInput(context.Background()).Body(newUsers).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding users: %v", err) } if apiResponse.StatusCode != 200 { @@ -82,7 +82,7 @@ func TestGetUserByName(t *testing.T) { assert := assert.New(t) resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting user by id: %v", err) } else { assert.Equal(*resp.Id, int64(1000), "User id should be equal") @@ -99,7 +99,7 @@ func TestGetUserByNameWithInvalidID(t *testing.T) { resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "999999999").Execute() if apiResponse != nil && apiResponse.StatusCode == 404 { return // This is a pass condition. API will return with a 404 error. - } else if err.Error() != "" { + } else if err != nil { t.Fatalf("Error while getting user by invalid id: %v", err) t.Log(apiResponse) } else { @@ -124,7 +124,7 @@ func TestUpdateUser(t *testing.T) { UserStatus: sw.PtrInt32(1)} apiResponse, err := client.UserApi.UpdateUser(context.Background(), "gopher").Body(newUser).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting user by id: %v", err) } if apiResponse.StatusCode != 200 { @@ -133,7 +133,7 @@ func TestUpdateUser(t *testing.T) { //verify changings are correct resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting user by id: %v", err) } else { assert.Equal(*resp.Id, int64(1000), "User id should be equal") diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go index c65c0c3ecbce..cb0ea16b894a 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go @@ -11,7 +11,6 @@ package x_auth_id_alias import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -32,7 +31,7 @@ type ApiAnyKeyRequest struct { } -func (r ApiAnyKeyRequest) Execute() (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiAnyKeyRequest) Execute() (map[string]interface{}, *_nethttp.Response, error) { return r.ApiService.AnyKeyExecute(r) } @@ -53,21 +52,19 @@ func (a *UsageApiService) AnyKey(ctx _context.Context) ApiAnyKeyRequest { * Execute executes the request * @return map[string]interface{} */ -func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]interface{} ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UsageApiService.AnyKey") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/any" @@ -123,22 +120,18 @@ func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interfac } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -158,7 +151,7 @@ func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interfac return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiBothKeysRequest struct { @@ -167,7 +160,7 @@ type ApiBothKeysRequest struct { } -func (r ApiBothKeysRequest) Execute() (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiBothKeysRequest) Execute() (map[string]interface{}, *_nethttp.Response, error) { return r.ApiService.BothKeysExecute(r) } @@ -188,21 +181,19 @@ func (a *UsageApiService) BothKeys(ctx _context.Context) ApiBothKeysRequest { * Execute executes the request * @return map[string]interface{} */ -func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]interface{} ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UsageApiService.BothKeys") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/both" @@ -258,22 +249,18 @@ func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]inte } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -293,7 +280,7 @@ func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]inte return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiKeyInHeaderRequest struct { @@ -302,7 +289,7 @@ type ApiKeyInHeaderRequest struct { } -func (r ApiKeyInHeaderRequest) Execute() (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiKeyInHeaderRequest) Execute() (map[string]interface{}, *_nethttp.Response, error) { return r.ApiService.KeyInHeaderExecute(r) } @@ -323,21 +310,19 @@ func (a *UsageApiService) KeyInHeader(ctx _context.Context) ApiKeyInHeaderReques * Execute executes the request * @return map[string]interface{} */ -func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]interface{} ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UsageApiService.KeyInHeader") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/header" @@ -379,22 +364,18 @@ func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[strin } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -414,7 +395,7 @@ func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[strin return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiKeyInQueryRequest struct { @@ -423,7 +404,7 @@ type ApiKeyInQueryRequest struct { } -func (r ApiKeyInQueryRequest) Execute() (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiKeyInQueryRequest) Execute() (map[string]interface{}, *_nethttp.Response, error) { return r.ApiService.KeyInQueryExecute(r) } @@ -444,21 +425,19 @@ func (a *UsageApiService) KeyInQuery(ctx _context.Context) ApiKeyInQueryRequest * Execute executes the request * @return map[string]interface{} */ -func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string]interface{}, *_nethttp.Response, GenericOpenAPIError) { +func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string]interface{}, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]interface{} ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UsageApiService.KeyInQuery") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/query" @@ -500,22 +479,18 @@ func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string] } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -535,5 +510,5 @@ func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string] return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/docs/UsageApi.md b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/docs/UsageApi.md index 86886e788654..6322c976a683 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/docs/UsageApi.md +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/docs/UsageApi.md @@ -36,7 +36,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UsageApi.AnyKey(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UsageApi.AnyKey``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -97,7 +97,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UsageApi.BothKeys(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UsageApi.BothKeys``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -158,7 +158,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UsageApi.KeyInHeader(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UsageApi.KeyInHeader``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -219,7 +219,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UsageApi.KeyInQuery(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UsageApi.KeyInQuery``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/auth_test.go b/samples/openapi3/client/petstore/go/auth_test.go index 0da295cc4812..aec544c2f26f 100644 --- a/samples/openapi3/client/petstore/go/auth_test.go +++ b/samples/openapi3/client/petstore/go/auth_test.go @@ -43,7 +43,7 @@ func TestOAuth2(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -52,7 +52,7 @@ func TestOAuth2(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -78,7 +78,7 @@ func TestBasicAuth(t *testing.T) { r, err := client.PetApi.AddPet(auth).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -87,7 +87,7 @@ func TestBasicAuth(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -108,7 +108,7 @@ func TestAccessToken(t *testing.T) { r, err := client.PetApi.AddPet(nil).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -117,7 +117,7 @@ func TestAccessToken(t *testing.T) { r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -138,7 +138,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -146,7 +146,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { } _, r, err = client.PetApi.GetPetById(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } @@ -156,7 +156,7 @@ func TestAPIKeyNoPrefix(t *testing.T) { } r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -173,7 +173,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { r, err := client.PetApi.AddPet(nil).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -181,7 +181,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { } _, r, err = client.PetApi.GetPetById(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } @@ -191,7 +191,7 @@ func TestAPIKeyWithPrefix(t *testing.T) { } r, err = client.PetApi.DeletePet(auth, 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -206,7 +206,7 @@ func TestDefaultHeader(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -215,7 +215,7 @@ func TestDefaultHeader(t *testing.T) { r, err = client.PetApi.DeletePet(context.Background(), 12992).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -230,7 +230,7 @@ func TestDefaultHeader(t *testing.T) { func TestHostOverride(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while finding pets by status: %v", err) } @@ -242,7 +242,7 @@ func TestHostOverride(t *testing.T) { func TestSchemeOverride(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while finding pets by status: %v", err) } diff --git a/samples/openapi3/client/petstore/go/fake_api_test.go b/samples/openapi3/client/petstore/go/fake_api_test.go index d93c11f85394..97910bf3cf7b 100644 --- a/samples/openapi3/client/petstore/go/fake_api_test.go +++ b/samples/openapi3/client/petstore/go/fake_api_test.go @@ -19,7 +19,7 @@ func TestPutBodyWithFileSchema(t *testing.T) { r, err := client.FakeApi.TestBodyWithFileSchema(context.Background()).FileSchemaTestClass(schema).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go index cd176050f102..497c6629b055 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type AnotherFakeApi interface { * Call123TestSpecialTagsExecute executes the request * @return Client */ - Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) } // AnotherFakeApiService AnotherFakeApi service @@ -54,7 +53,7 @@ func (r ApiCall123TestSpecialTagsRequest) Client(client Client) ApiCall123TestSp return r } -func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.Call123TestSpecialTagsExecute(r) } @@ -75,21 +74,19 @@ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) Api * Execute executes the request * @return Client */ -func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSpecialTagsRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AnotherFakeApiService.Call123TestSpecialTags") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/another-fake/dummy" @@ -98,8 +95,7 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.client == nil { - executionError.error = "client is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("client is required and must be specified") } // to determine the Content-Type header @@ -123,22 +119,18 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarPostBody = r.client req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -158,5 +150,5 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_default.go b/samples/openapi3/client/petstore/go/go-petstore/api_default.go index 39cc4811b231..b9a217a0efe6 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_default.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_default.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -36,7 +35,7 @@ type DefaultApi interface { * FooGetExecute executes the request * @return InlineResponseDefault */ - FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, GenericOpenAPIError) + FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, error) } // DefaultApiService DefaultApi service @@ -48,7 +47,7 @@ type ApiFooGetRequest struct { } -func (r ApiFooGetRequest) Execute() (InlineResponseDefault, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFooGetRequest) Execute() (InlineResponseDefault, *_nethttp.Response, error) { return r.ApiService.FooGetExecute(r) } @@ -68,21 +67,19 @@ func (a *DefaultApiService) FooGet(ctx _context.Context) ApiFooGetRequest { * Execute executes the request * @return InlineResponseDefault */ -func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, GenericOpenAPIError) { +func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDefault, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue InlineResponseDefault ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.FooGet") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/foo" @@ -110,22 +107,18 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDef } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -152,5 +145,5 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDef return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go index 4efcec605884..fc9fb9b597e3 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -39,7 +38,7 @@ type FakeApi interface { * FakeHealthGetExecute executes the request * @return HealthCheckResult */ - FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, GenericOpenAPIError) + FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, error) /* * FakeOuterBooleanSerialize Method for FakeOuterBooleanSerialize @@ -53,7 +52,7 @@ type FakeApi interface { * FakeOuterBooleanSerializeExecute executes the request * @return bool */ - FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, GenericOpenAPIError) + FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) /* * FakeOuterCompositeSerialize Method for FakeOuterCompositeSerialize @@ -67,7 +66,7 @@ type FakeApi interface { * FakeOuterCompositeSerializeExecute executes the request * @return OuterComposite */ - FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, GenericOpenAPIError) + FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) /* * FakeOuterNumberSerialize Method for FakeOuterNumberSerialize @@ -81,7 +80,7 @@ type FakeApi interface { * FakeOuterNumberSerializeExecute executes the request * @return float32 */ - FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, GenericOpenAPIError) + FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) /* * FakeOuterStringSerialize Method for FakeOuterStringSerialize @@ -95,7 +94,7 @@ type FakeApi interface { * FakeOuterStringSerializeExecute executes the request * @return string */ - FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, GenericOpenAPIError) + FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) /* * TestBodyWithFileSchema Method for TestBodyWithFileSchema @@ -108,7 +107,7 @@ type FakeApi interface { /* * TestBodyWithFileSchemaExecute executes the request */ - TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, GenericOpenAPIError) + TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) /* * TestBodyWithQueryParams Method for TestBodyWithQueryParams @@ -120,7 +119,7 @@ type FakeApi interface { /* * TestBodyWithQueryParamsExecute executes the request */ - TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, GenericOpenAPIError) + TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) /* * TestClientModel To test \"client\" model @@ -134,7 +133,7 @@ type FakeApi interface { * TestClientModelExecute executes the request * @return Client */ - TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) /* * TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -151,7 +150,7 @@ type FakeApi interface { /* * TestEndpointParametersExecute executes the request */ - TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) /* * TestEnumParameters To test enum parameters @@ -164,7 +163,7 @@ type FakeApi interface { /* * TestEnumParametersExecute executes the request */ - TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) /* * TestGroupParameters Fake endpoint to test group parameters (optional) @@ -177,7 +176,7 @@ type FakeApi interface { /* * TestGroupParametersExecute executes the request */ - TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, GenericOpenAPIError) + TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) /* * TestInlineAdditionalProperties test inline additionalProperties @@ -189,7 +188,7 @@ type FakeApi interface { /* * TestInlineAdditionalPropertiesExecute executes the request */ - TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, GenericOpenAPIError) + TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) /* * TestJsonFormData test json serialization of form data @@ -201,7 +200,7 @@ type FakeApi interface { /* * TestJsonFormDataExecute executes the request */ - TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, GenericOpenAPIError) + TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) /* * TestQueryParameterCollectionFormat Method for TestQueryParameterCollectionFormat @@ -214,7 +213,7 @@ type FakeApi interface { /* * TestQueryParameterCollectionFormatExecute executes the request */ - TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, GenericOpenAPIError) + TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) } // FakeApiService FakeApi service @@ -226,7 +225,7 @@ type ApiFakeHealthGetRequest struct { } -func (r ApiFakeHealthGetRequest) Execute() (HealthCheckResult, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeHealthGetRequest) Execute() (HealthCheckResult, *_nethttp.Response, error) { return r.ApiService.FakeHealthGetExecute(r) } @@ -246,21 +245,19 @@ func (a *FakeApiService) FakeHealthGet(ctx _context.Context) ApiFakeHealthGetReq * Execute executes the request * @return HealthCheckResult */ -func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (HealthCheckResult, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue HealthCheckResult ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeHealthGet") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/health" @@ -288,22 +285,18 @@ func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (Health } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -323,7 +316,7 @@ func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (Health return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterBooleanSerializeRequest struct { @@ -337,7 +330,7 @@ func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBoolean return r } -func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, error) { return r.ApiService.FakeOuterBooleanSerializeExecute(r) } @@ -358,21 +351,19 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx _context.Context) ApiFake * Execute executes the request * @return bool */ -func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanSerializeRequest) (bool, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue bool ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterBooleanSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/boolean" @@ -402,22 +393,18 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -437,7 +424,7 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterCompositeSerializeRequest struct { @@ -451,7 +438,7 @@ func (r ApiFakeOuterCompositeSerializeRequest) OuterComposite(outerComposite Out return r } -func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, error) { return r.ApiService.FakeOuterCompositeSerializeExecute(r) } @@ -472,21 +459,19 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx _context.Context) ApiFa * Execute executes the request * @return OuterComposite */ -func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompositeSerializeRequest) (OuterComposite, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue OuterComposite ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterCompositeSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/composite" @@ -516,22 +501,18 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos localVarPostBody = r.outerComposite req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -551,7 +532,7 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterNumberSerializeRequest struct { @@ -565,7 +546,7 @@ func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumbe return r } -func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, error) { return r.ApiService.FakeOuterNumberSerializeExecute(r) } @@ -586,21 +567,19 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx _context.Context) ApiFakeO * Execute executes the request * @return float32 */ -func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSerializeRequest) (float32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue float32 ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterNumberSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/number" @@ -630,22 +609,18 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -665,7 +640,7 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFakeOuterStringSerializeRequest struct { @@ -679,7 +654,7 @@ func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterString return r } -func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, error) { return r.ApiService.FakeOuterStringSerializeExecute(r) } @@ -700,21 +675,19 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx _context.Context) ApiFakeO * Execute executes the request * @return string */ -func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSerializeRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue string ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.FakeOuterStringSerialize") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/outer/string" @@ -744,22 +717,18 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer localVarPostBody = r.body req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -779,7 +748,7 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiTestBodyWithFileSchemaRequest struct { @@ -793,7 +762,7 @@ func (r ApiTestBodyWithFileSchemaRequest) FileSchemaTestClass(fileSchemaTestClas return r } -func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestBodyWithFileSchemaExecute(r) } @@ -813,20 +782,18 @@ func (a *FakeApiService) TestBodyWithFileSchema(ctx _context.Context) ApiTestBod /* * Execute executes the request */ -func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSchemaRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestBodyWithFileSchema") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/body-with-file-schema" @@ -835,8 +802,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.fileSchemaTestClass == nil { - executionError.error = "fileSchemaTestClass is required and must be specified" - return nil, executionError + return nil, reportError("fileSchemaTestClass is required and must be specified") } // to determine the Content-Type header @@ -860,22 +826,18 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarPostBody = r.fileSchemaTestClass req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -886,7 +848,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestBodyWithQueryParamsRequest struct { @@ -905,7 +867,7 @@ func (r ApiTestBodyWithQueryParamsRequest) User(user User) ApiTestBodyWithQueryP return r } -func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestBodyWithQueryParamsExecute(r) } @@ -924,20 +886,18 @@ func (a *FakeApiService) TestBodyWithQueryParams(ctx _context.Context) ApiTestBo /* * Execute executes the request */ -func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryParamsRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestBodyWithQueryParams") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/body-with-query-params" @@ -946,12 +906,10 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.query == nil { - executionError.error = "query is required and must be specified" - return nil, executionError + return nil, reportError("query is required and must be specified") } if r.user == nil { - executionError.error = "user is required and must be specified" - return nil, executionError + return nil, reportError("user is required and must be specified") } localVarQueryParams.Add("query", parameterToString(*r.query, "")) @@ -976,22 +934,18 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarPostBody = r.user req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1002,7 +956,7 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestClientModelRequest struct { @@ -1016,7 +970,7 @@ func (r ApiTestClientModelRequest) Client(client Client) ApiTestClientModelReque return r } -func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.TestClientModelExecute(r) } @@ -1037,21 +991,19 @@ func (a *FakeApiService) TestClientModel(ctx _context.Context) ApiTestClientMode * Execute executes the request * @return Client */ -func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestClientModel") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1060,8 +1012,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.client == nil { - executionError.error = "client is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("client is required and must be specified") } // to determine the Content-Type header @@ -1085,22 +1036,18 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarPostBody = r.client req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1120,7 +1067,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiTestEndpointParametersRequest struct { @@ -1199,7 +1146,7 @@ func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpo return r } -func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestEndpointParametersExecute(r) } @@ -1223,20 +1170,18 @@ func (a *FakeApiService) TestEndpointParameters(ctx _context.Context) ApiTestEnd /* * Execute executes the request */ -func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestEndpointParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1245,36 +1190,28 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.number == nil { - executionError.error = "number is required and must be specified" - return nil, executionError + return nil, reportError("number is required and must be specified") } if *r.number < 32.1 { - executionError.error = "number must be greater than 32.1" - return nil, executionError + return nil, reportError("number must be greater than 32.1") } if *r.number > 543.2 { - executionError.error = "number must be less than 543.2" - return nil, executionError + return nil, reportError("number must be less than 543.2") } if r.double == nil { - executionError.error = "double is required and must be specified" - return nil, executionError + return nil, reportError("double is required and must be specified") } if *r.double < 67.8 { - executionError.error = "double must be greater than 67.8" - return nil, executionError + return nil, reportError("double must be greater than 67.8") } if *r.double > 123.4 { - executionError.error = "double must be less than 123.4" - return nil, executionError + return nil, reportError("double must be less than 123.4") } if r.patternWithoutDelimiter == nil { - executionError.error = "patternWithoutDelimiter is required and must be specified" - return nil, executionError + return nil, reportError("patternWithoutDelimiter is required and must be specified") } if r.byte_ == nil { - executionError.error = "byte_ is required and must be specified" - return nil, executionError + return nil, reportError("byte_ is required and must be specified") } // to determine the Content-Type header @@ -1338,22 +1275,18 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1364,7 +1297,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestEnumParametersRequest struct { @@ -1413,7 +1346,7 @@ func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiT return r } -func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestEnumParametersExecute(r) } @@ -1433,20 +1366,18 @@ func (a *FakeApiService) TestEnumParameters(ctx _context.Context) ApiTestEnumPar /* * Execute executes the request */ -func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestEnumParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1506,22 +1437,18 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1532,7 +1459,7 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestGroupParametersRequest struct { @@ -1571,7 +1498,7 @@ func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroup return r } -func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestGroupParametersExecute(r) } @@ -1591,20 +1518,18 @@ func (a *FakeApiService) TestGroupParameters(ctx _context.Context) ApiTestGroupP /* * Execute executes the request */ -func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestGroupParameters") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake" @@ -1613,16 +1538,13 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.requiredStringGroup == nil { - executionError.error = "requiredStringGroup is required and must be specified" - return nil, executionError + return nil, reportError("requiredStringGroup is required and must be specified") } if r.requiredBooleanGroup == nil { - executionError.error = "requiredBooleanGroup is required and must be specified" - return nil, executionError + return nil, reportError("requiredBooleanGroup is required and must be specified") } if r.requiredInt64Group == nil { - executionError.error = "requiredInt64Group is required and must be specified" - return nil, executionError + return nil, reportError("requiredInt64Group is required and must be specified") } localVarQueryParams.Add("required_string_group", parameterToString(*r.requiredStringGroup, "")) @@ -1656,22 +1578,18 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1682,7 +1600,7 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestInlineAdditionalPropertiesRequest struct { @@ -1696,7 +1614,7 @@ func (r ApiTestInlineAdditionalPropertiesRequest) RequestBody(requestBody map[st return r } -func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestInlineAdditionalPropertiesExecute(r) } @@ -1715,20 +1633,18 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx _context.Context) Ap /* * Execute executes the request */ -func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAdditionalPropertiesRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestInlineAdditionalProperties") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/inline-additionalProperties" @@ -1737,8 +1653,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.requestBody == nil { - executionError.error = "requestBody is required and must be specified" - return nil, executionError + return nil, reportError("requestBody is required and must be specified") } // to determine the Content-Type header @@ -1762,22 +1677,18 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarPostBody = r.requestBody req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1788,7 +1699,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestJsonFormDataRequest struct { @@ -1807,7 +1718,7 @@ func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataReq return r } -func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestJsonFormDataExecute(r) } @@ -1826,20 +1737,18 @@ func (a *FakeApiService) TestJsonFormData(ctx _context.Context) ApiTestJsonFormD /* * Execute executes the request */ -func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestJsonFormData") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/jsonFormData" @@ -1848,12 +1757,10 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.param == nil { - executionError.error = "param is required and must be specified" - return nil, executionError + return nil, reportError("param is required and must be specified") } if r.param2 == nil { - executionError.error = "param2 is required and must be specified" - return nil, executionError + return nil, reportError("param2 is required and must be specified") } // to determine the Content-Type header @@ -1877,22 +1784,18 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarFormParams.Add("param2", parameterToString(*r.param2, "")) req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1903,7 +1806,7 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiTestQueryParameterCollectionFormatRequest struct { @@ -1937,7 +1840,7 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Context(context []string) return r } -func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.TestQueryParameterCollectionFormatExecute(r) } @@ -1957,20 +1860,18 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context /* * Execute executes the request */ -func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQueryParameterCollectionFormatRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeApiService.TestQueryParameterCollectionFormat") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/test-query-paramters" @@ -1979,24 +1880,19 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.pipe == nil { - executionError.error = "pipe is required and must be specified" - return nil, executionError + return nil, reportError("pipe is required and must be specified") } if r.ioutil == nil { - executionError.error = "ioutil is required and must be specified" - return nil, executionError + return nil, reportError("ioutil is required and must be specified") } if r.http == nil { - executionError.error = "http is required and must be specified" - return nil, executionError + return nil, reportError("http is required and must be specified") } if r.url == nil { - executionError.error = "url is required and must be specified" - return nil, executionError + return nil, reportError("url is required and must be specified") } if r.context == nil { - executionError.error = "context is required and must be specified" - return nil, executionError + return nil, reportError("context is required and must be specified") } { @@ -2043,22 +1939,18 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -2069,5 +1961,5 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go index 74fc36e91d7d..3ec0cd5efc74 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type FakeClassnameTags123Api interface { * TestClassnameExecute executes the request * @return Client */ - TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, GenericOpenAPIError) + TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) } // FakeClassnameTags123ApiService FakeClassnameTags123Api service @@ -54,7 +53,7 @@ func (r ApiTestClassnameRequest) Client(client Client) ApiTestClassnameRequest { return r } -func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) { return r.ApiService.TestClassnameExecute(r) } @@ -75,21 +74,19 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx _context.Context) Api * Execute executes the request * @return Client */ -func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, GenericOpenAPIError) { +func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassnameRequest) (Client, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPatch localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Client ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "FakeClassnameTags123ApiService.TestClassname") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake_classname_test" @@ -98,8 +95,7 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.client == nil { - executionError.error = "client is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("client is required and must be specified") } // to determine the Content-Type header @@ -137,22 +133,18 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -172,5 +164,5 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go index b0fc33bfdde1..de2a7cca8b29 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type PetApi interface { /* * AddPetExecute executes the request */ - AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, GenericOpenAPIError) + AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) /* * DeletePet Deletes a pet @@ -50,7 +49,7 @@ type PetApi interface { /* * DeletePetExecute executes the request */ - DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, GenericOpenAPIError) + DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) /* * FindPetsByStatus Finds Pets by status @@ -64,7 +63,7 @@ type PetApi interface { * FindPetsByStatusExecute executes the request * @return []Pet */ - FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) + FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) /* * FindPetsByTags Finds Pets by tags @@ -78,7 +77,7 @@ type PetApi interface { * FindPetsByTagsExecute executes the request * @return []Pet */ - FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) + FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) /* * GetPetById Find pet by ID @@ -93,7 +92,7 @@ type PetApi interface { * GetPetByIdExecute executes the request * @return Pet */ - GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, GenericOpenAPIError) + GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) /* * UpdatePet Update an existing pet @@ -105,7 +104,7 @@ type PetApi interface { /* * UpdatePetExecute executes the request */ - UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) /* * UpdatePetWithForm Updates a pet in the store with form data @@ -118,7 +117,7 @@ type PetApi interface { /* * UpdatePetWithFormExecute executes the request */ - UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) /* * UploadFile uploads an image @@ -132,7 +131,7 @@ type PetApi interface { * UploadFileExecute executes the request * @return ApiResponse */ - UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) + UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) /* * UploadFileWithRequiredFile uploads an image (required) @@ -146,7 +145,7 @@ type PetApi interface { * UploadFileWithRequiredFileExecute executes the request * @return ApiResponse */ - UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) + UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) } // PetApiService PetApi service @@ -163,7 +162,7 @@ func (r ApiAddPetRequest) Pet(pet Pet) ApiAddPetRequest { return r } -func (r ApiAddPetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.AddPetExecute(r) } @@ -182,20 +181,18 @@ func (a *PetApiService) AddPet(ctx _context.Context) ApiAddPetRequest { /* * Execute executes the request */ -func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.AddPet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet" @@ -204,8 +201,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.pet == nil { - executionError.error = "pet is required and must be specified" - return nil, executionError + return nil, reportError("pet is required and must be specified") } // to determine the Content-Type header @@ -229,22 +225,18 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G localVarPostBody = r.pet req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -255,7 +247,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, G return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiDeletePetRequest struct { @@ -270,7 +262,7 @@ func (r ApiDeletePetRequest) ApiKey(apiKey string) ApiDeletePetRequest { return r } -func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeletePetExecute(r) } @@ -291,20 +283,18 @@ func (a *PetApiService) DeletePet(ctx _context.Context, petId int64) ApiDeletePe /* * Execute executes the request */ -func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.DeletePet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -336,22 +326,18 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -362,7 +348,7 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiFindPetsByStatusRequest struct { @@ -376,7 +362,7 @@ func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusR return r } -func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) { return r.ApiService.FindPetsByStatusExecute(r) } @@ -397,21 +383,19 @@ func (a *PetApiService) FindPetsByStatus(ctx _context.Context) ApiFindPetsByStat * Execute executes the request * @return []Pet */ -func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue []Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.FindPetsByStatus") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/findByStatus" @@ -420,8 +404,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.status == nil { - executionError.error = "status is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("status is required and must be specified") } localVarQueryParams.Add("status", parameterToString(*r.status, "csv")) @@ -444,22 +427,18 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -479,7 +458,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiFindPetsByTagsRequest struct { @@ -493,7 +472,7 @@ func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest { return r } -func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) { return r.ApiService.FindPetsByTagsExecute(r) } @@ -514,21 +493,19 @@ func (a *PetApiService) FindPetsByTags(ctx _context.Context) ApiFindPetsByTagsRe * Execute executes the request * @return []Pet */ -func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue []Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.FindPetsByTags") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/findByTags" @@ -537,8 +514,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.tags == nil { - executionError.error = "tags is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("tags is required and must be specified") } localVarQueryParams.Add("tags", parameterToString(*r.tags, "csv")) @@ -561,22 +537,18 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -596,7 +568,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiGetPetByIdRequest struct { @@ -606,7 +578,7 @@ type ApiGetPetByIdRequest struct { } -func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) { return r.ApiService.GetPetByIdExecute(r) } @@ -629,21 +601,19 @@ func (a *PetApiService) GetPetById(ctx _context.Context, petId int64) ApiGetPetB * Execute executes the request * @return Pet */ -func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Pet ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.GetPetById") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -686,22 +656,18 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -721,7 +687,7 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiUpdatePetRequest struct { @@ -735,7 +701,7 @@ func (r ApiUpdatePetRequest) Pet(pet Pet) ApiUpdatePetRequest { return r } -func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdatePetExecute(r) } @@ -754,20 +720,18 @@ func (a *PetApiService) UpdatePet(ctx _context.Context) ApiUpdatePetRequest { /* * Execute executes the request */ -func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UpdatePet") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet" @@ -776,8 +740,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.pet == nil { - executionError.error = "pet is required and must be specified" - return nil, executionError + return nil, reportError("pet is required and must be specified") } // to determine the Content-Type header @@ -801,22 +764,18 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarPostBody = r.pet req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -827,7 +786,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUpdatePetWithFormRequest struct { @@ -847,7 +806,7 @@ func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormR return r } -func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdatePetWithFormExecute(r) } @@ -868,20 +827,18 @@ func (a *PetApiService) UpdatePetWithForm(ctx _context.Context, petId int64) Api /* * Execute executes the request */ -func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UpdatePetWithForm") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}" @@ -916,22 +873,18 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -942,7 +895,7 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUploadFileRequest struct { @@ -962,7 +915,7 @@ func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest { return r } -func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) { return r.ApiService.UploadFileExecute(r) } @@ -984,21 +937,19 @@ func (a *PetApiService) UploadFile(ctx _context.Context, petId int64) ApiUploadF * Execute executes the request * @return ApiResponse */ -func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue ApiResponse ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UploadFile") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/pet/{petId}/uploadImage" @@ -1041,22 +992,18 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1076,7 +1023,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiUploadFileWithRequiredFileRequest struct { @@ -1096,7 +1043,7 @@ func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetad return r } -func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) { return r.ApiService.UploadFileWithRequiredFileExecute(r) } @@ -1118,21 +1065,19 @@ func (a *PetApiService) UploadFileWithRequiredFile(ctx _context.Context, petId i * Execute executes the request * @return ApiResponse */ -func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, GenericOpenAPIError) { +func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithRequiredFileRequest) (ApiResponse, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue ApiResponse ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "PetApiService.UploadFileWithRequiredFile") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/fake/{petId}/uploadImageWithRequiredFile" @@ -1142,8 +1087,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.requiredFile == nil { - executionError.error = "requiredFile is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("requiredFile is required and must be specified") } // to determine the Content-Type header @@ -1176,22 +1120,18 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -1211,5 +1151,5 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_store.go b/samples/openapi3/client/petstore/go/go-petstore/api_store.go index 1a6be58b7238..685b6ed0fd17 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_store.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_store.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -38,7 +37,7 @@ type StoreApi interface { /* * DeleteOrderExecute executes the request */ - DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, GenericOpenAPIError) + DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) /* * GetInventory Returns pet inventories by status @@ -52,7 +51,7 @@ type StoreApi interface { * GetInventoryExecute executes the request * @return map[string]int32 */ - GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, GenericOpenAPIError) + GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) /* * GetOrderById Find purchase order by ID @@ -67,7 +66,7 @@ type StoreApi interface { * GetOrderByIdExecute executes the request * @return Order */ - GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, GenericOpenAPIError) + GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) /* * PlaceOrder Place an order for a pet @@ -80,7 +79,7 @@ type StoreApi interface { * PlaceOrderExecute executes the request * @return Order */ - PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, GenericOpenAPIError) + PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) } // StoreApiService StoreApi service @@ -93,7 +92,7 @@ type ApiDeleteOrderRequest struct { } -func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeleteOrderExecute(r) } @@ -115,20 +114,18 @@ func (a *StoreApiService) DeleteOrder(ctx _context.Context, orderId string) ApiD /* * Execute executes the request */ -func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.DeleteOrder") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order/{order_id}" @@ -157,22 +154,18 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -183,7 +176,7 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiGetInventoryRequest struct { @@ -192,7 +185,7 @@ type ApiGetInventoryRequest struct { } -func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, error) { return r.ApiService.GetInventoryExecute(r) } @@ -213,21 +206,19 @@ func (a *StoreApiService) GetInventory(ctx _context.Context) ApiGetInventoryRequ * Execute executes the request * @return map[string]int32 */ -func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[string]int32, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue map[string]int32 ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.GetInventory") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/inventory" @@ -269,22 +260,18 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -304,7 +291,7 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiGetOrderByIdRequest struct { @@ -314,7 +301,7 @@ type ApiGetOrderByIdRequest struct { } -func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) { return r.ApiService.GetOrderByIdExecute(r) } @@ -337,21 +324,19 @@ func (a *StoreApiService) GetOrderById(ctx _context.Context, orderId int64) ApiG * Execute executes the request * @return Order */ -func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Order ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.GetOrderById") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order/{order_id}" @@ -361,12 +346,10 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.orderId < 1 { - executionError.error = "orderId must be greater than 1" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("orderId must be greater than 1") } if r.orderId > 5 { - executionError.error = "orderId must be less than 5" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("orderId must be less than 5") } // to determine the Content-Type header @@ -388,22 +371,18 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -423,7 +402,7 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiPlaceOrderRequest struct { @@ -437,7 +416,7 @@ func (r ApiPlaceOrderRequest) Order(order Order) ApiPlaceOrderRequest { return r } -func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) { return r.ApiService.PlaceOrderExecute(r) } @@ -457,21 +436,19 @@ func (a *StoreApiService) PlaceOrder(ctx _context.Context) ApiPlaceOrderRequest * Execute executes the request * @return Order */ -func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, GenericOpenAPIError) { +func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue Order ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "StoreApiService.PlaceOrder") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/store/order" @@ -480,8 +457,7 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.order == nil { - executionError.error = "order is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("order is required and must be specified") } // to determine the Content-Type header @@ -505,22 +481,18 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarPostBody = r.order req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -540,5 +512,5 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_user.go b/samples/openapi3/client/petstore/go/go-petstore/api_user.go index 9abef9ffe6e3..7246b5737854 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_user.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_user.go @@ -11,7 +11,6 @@ package petstore import ( - "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -37,7 +36,7 @@ type UserApi interface { /* * CreateUserExecute executes the request */ - CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) /* * CreateUsersWithArrayInput Creates list of users with given input array @@ -49,7 +48,7 @@ type UserApi interface { /* * CreateUsersWithArrayInputExecute executes the request */ - CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) /* * CreateUsersWithListInput Creates list of users with given input array @@ -61,7 +60,7 @@ type UserApi interface { /* * CreateUsersWithListInputExecute executes the request */ - CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, GenericOpenAPIError) + CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) /* * DeleteUser Delete user @@ -75,7 +74,7 @@ type UserApi interface { /* * DeleteUserExecute executes the request */ - DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, GenericOpenAPIError) + DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) /* * GetUserByName Get user by user name @@ -89,7 +88,7 @@ type UserApi interface { * GetUserByNameExecute executes the request * @return User */ - GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, GenericOpenAPIError) + GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) /* * LoginUser Logs user into the system @@ -102,7 +101,7 @@ type UserApi interface { * LoginUserExecute executes the request * @return string */ - LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, GenericOpenAPIError) + LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) /* * LogoutUser Logs out current logged in user session @@ -114,7 +113,7 @@ type UserApi interface { /* * LogoutUserExecute executes the request */ - LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, GenericOpenAPIError) + LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) /* * UpdateUser Updated user @@ -128,7 +127,7 @@ type UserApi interface { /* * UpdateUserExecute executes the request */ - UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, GenericOpenAPIError) + UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) } // UserApiService UserApi service @@ -145,7 +144,7 @@ func (r ApiCreateUserRequest) User(user User) ApiCreateUserRequest { return r } -func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUserExecute(r) } @@ -165,20 +164,18 @@ func (a *UserApiService) CreateUser(ctx _context.Context) ApiCreateUserRequest { /* * Execute executes the request */ -func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user" @@ -187,8 +184,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.user == nil { - executionError.error = "user is required and must be specified" - return nil, executionError + return nil, reportError("user is required and must be specified") } // to determine the Content-Type header @@ -212,22 +208,18 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarPostBody = r.user req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -238,7 +230,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiCreateUsersWithArrayInputRequest struct { @@ -252,7 +244,7 @@ func (r ApiCreateUsersWithArrayInputRequest) User(user []User) ApiCreateUsersWit return r } -func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUsersWithArrayInputRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUsersWithArrayInputExecute(r) } @@ -271,20 +263,18 @@ func (a *UserApiService) CreateUsersWithArrayInput(ctx _context.Context) ApiCrea /* * Execute executes the request */ -func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithArrayInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUsersWithArrayInput") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/createWithArray" @@ -293,8 +283,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.user == nil { - executionError.error = "user is required and must be specified" - return nil, executionError + return nil, reportError("user is required and must be specified") } // to determine the Content-Type header @@ -318,22 +307,18 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarPostBody = r.user req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -344,7 +329,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiCreateUsersWithListInputRequest struct { @@ -358,7 +343,7 @@ func (r ApiCreateUsersWithListInputRequest) User(user []User) ApiCreateUsersWith return r } -func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiCreateUsersWithListInputRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.CreateUsersWithListInputExecute(r) } @@ -377,20 +362,18 @@ func (a *UserApiService) CreateUsersWithListInput(ctx _context.Context) ApiCreat /* * Execute executes the request */ -func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithListInputRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.CreateUsersWithListInput") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/createWithList" @@ -399,8 +382,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.user == nil { - executionError.error = "user is required and must be specified" - return nil, executionError + return nil, reportError("user is required and must be specified") } // to determine the Content-Type header @@ -424,22 +406,18 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarPostBody = r.user req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -450,7 +428,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiDeleteUserRequest struct { @@ -460,7 +438,7 @@ type ApiDeleteUserRequest struct { } -func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiDeleteUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.DeleteUserExecute(r) } @@ -482,20 +460,18 @@ func (a *UserApiService) DeleteUser(ctx _context.Context, username string) ApiDe /* * Execute executes the request */ -func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodDelete localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.DeleteUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -524,22 +500,18 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -550,7 +522,7 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiGetUserByNameRequest struct { @@ -560,7 +532,7 @@ type ApiGetUserByNameRequest struct { } -func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiGetUserByNameRequest) Execute() (User, *_nethttp.Response, error) { return r.ApiService.GetUserByNameExecute(r) } @@ -582,21 +554,19 @@ func (a *UserApiService) GetUserByName(ctx _context.Context, username string) Ap * Execute executes the request * @return User */ -func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue User ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.GetUserByName") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -625,22 +595,18 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -660,7 +626,7 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiLoginUserRequest struct { @@ -679,7 +645,7 @@ func (r ApiLoginUserRequest) Password(password string) ApiLoginUserRequest { return r } -func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, GenericOpenAPIError) { +func (r ApiLoginUserRequest) Execute() (string, *_nethttp.Response, error) { return r.ApiService.LoginUserExecute(r) } @@ -699,21 +665,19 @@ func (a *UserApiService) LoginUser(ctx _context.Context) ApiLoginUserRequest { * Execute executes the request * @return string */ -func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError localVarReturnValue string ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.LoginUser") if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/login" @@ -722,12 +686,10 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.username == nil { - executionError.error = "username is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("username is required and must be specified") } if r.password == nil { - executionError.error = "password is required and must be specified" - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, reportError("password is required and must be specified") } localVarQueryParams.Add("username", parameterToString(*r.username, "")) @@ -751,22 +713,18 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, nil, executionError + return localVarReturnValue, nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -786,7 +744,7 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth return localVarReturnValue, localVarHTTPResponse, newErr } - return localVarReturnValue, localVarHTTPResponse, executionError + return localVarReturnValue, localVarHTTPResponse, nil } type ApiLogoutUserRequest struct { @@ -795,7 +753,7 @@ type ApiLogoutUserRequest struct { } -func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiLogoutUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.LogoutUserExecute(r) } @@ -814,20 +772,18 @@ func (a *UserApiService) LogoutUser(ctx _context.Context) ApiLogoutUserRequest { /* * Execute executes the request */ -func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodGet localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.LogoutUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/logout" @@ -855,22 +811,18 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re } req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -881,7 +833,7 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } type ApiUpdateUserRequest struct { @@ -896,7 +848,7 @@ func (r ApiUpdateUserRequest) User(user User) ApiUpdateUserRequest { return r } -func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, GenericOpenAPIError) { +func (r ApiUpdateUserRequest) Execute() (*_nethttp.Response, error) { return r.ApiService.UpdateUserExecute(r) } @@ -918,20 +870,18 @@ func (a *UserApiService) UpdateUser(ctx _context.Context, username string) ApiUp /* * Execute executes the request */ -func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, GenericOpenAPIError) { +func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPut localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - executionError GenericOpenAPIError ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "UserApiService.UpdateUser") if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, GenericOpenAPIError{error: err.Error()} } localVarPath := localBasePath + "/user/{username}" @@ -941,8 +891,7 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarQueryParams := _neturl.Values{} localVarFormParams := _neturl.Values{} if r.user == nil { - executionError.error = "user is required and must be specified" - return nil, executionError + return nil, reportError("user is required and must be specified") } // to determine the Content-Type header @@ -966,22 +915,18 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarPostBody = r.user req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) if err != nil { - executionError.error = err.Error() - return nil, executionError + return nil, err } localVarHTTPResponse, err := a.client.callAPI(req) if err != nil || localVarHTTPResponse == nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() - localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { - executionError.error = err.Error() - return localVarHTTPResponse, executionError + return localVarHTTPResponse, err } if localVarHTTPResponse.StatusCode >= 300 { @@ -992,5 +937,5 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re return localVarHTTPResponse, newErr } - return localVarHTTPResponse, executionError + return localVarHTTPResponse, nil } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/AnotherFakeApi.md index 61bca6d3f217..cd383de7c66c 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/AnotherFakeApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/AnotherFakeApi.md @@ -34,7 +34,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.AnotherFakeApi.Call123TestSpecialTags(context.Background()).Client(client).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `AnotherFakeApi.Call123TestSpecialTags``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/DefaultApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/DefaultApi.md index 68ec4cee33b4..9f60fbb4ec04 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/DefaultApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/DefaultApi.md @@ -31,7 +31,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.DefaultApi.FooGet(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `DefaultApi.FooGet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md index 83bb9c1dcb65..9021892276ca 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeApi.md @@ -44,7 +44,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeHealthGet(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeHealthGet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -106,7 +106,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterBooleanSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterBooleanSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -172,7 +172,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterCompositeSerialize(context.Background()).OuterComposite(outerComposite).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterCompositeSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -238,7 +238,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterNumberSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterNumberSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -304,7 +304,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.FakeOuterStringSerialize(context.Background()).Body(body).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.FakeOuterStringSerialize``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -370,7 +370,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestBodyWithFileSchema(context.Background()).FileSchemaTestClass(fileSchemaTestClass).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestBodyWithFileSchema``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -433,7 +433,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestBodyWithQueryParams(context.Background()).Query(query).User(user).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestBodyWithQueryParams``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -498,7 +498,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestClientModel(context.Background()).Client(client).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestClientModel``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -578,7 +578,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestEndpointParameters(context.Background()).Number(number).Double(double).PatternWithoutDelimiter(patternWithoutDelimiter).Byte_(byte_).Integer(integer).Int32_(int32_).Int64_(int64_).Float(float).String_(string_).Binary(binary).Date(date).DateTime(dateTime).Password(password).Callback(callback).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestEndpointParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -662,7 +662,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestEnumParameters(context.Background()).EnumHeaderStringArray(enumHeaderStringArray).EnumHeaderString(enumHeaderString).EnumQueryStringArray(enumQueryStringArray).EnumQueryString(enumQueryString).EnumQueryInteger(enumQueryInteger).EnumQueryDouble(enumQueryDouble).EnumFormStringArray(enumFormStringArray).EnumFormString(enumFormString).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestEnumParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -738,7 +738,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestGroupParameters(context.Background()).RequiredStringGroup(requiredStringGroup).RequiredBooleanGroup(requiredBooleanGroup).RequiredInt64Group(requiredInt64Group).StringGroup(stringGroup).BooleanGroup(booleanGroup).Int64Group(int64Group).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestGroupParameters``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -805,7 +805,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestInlineAdditionalProperties(context.Background()).RequestBody(requestBody).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestInlineAdditionalProperties``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -868,7 +868,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestJsonFormData(context.Background()).Param(param).Param2(param2).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestJsonFormData``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -937,7 +937,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeApi.TestQueryParameterCollectionFormat(context.Background()).Pipe(pipe).Ioutil(ioutil).Http(http).Url(url).Context(context).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeApi.TestQueryParameterCollectionFormat``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md index a4ae5edae874..27a260ff8130 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/FakeClassnameTags123Api.md @@ -34,7 +34,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.FakeClassnameTags123Api.TestClassname(context.Background()).Client(client).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `FakeClassnameTags123Api.TestClassname``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md index 1eed51f91aa5..c99794e706dc 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/PetApi.md @@ -40,7 +40,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.AddPet(context.Background()).Pet(pet).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.AddPet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -103,7 +103,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.DeletePet(context.Background(), petId).ApiKey(apiKey).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.DeletePet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -172,7 +172,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.FindPetsByStatus(context.Background()).Status(status).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.FindPetsByStatus``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -238,7 +238,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.FindPetsByTags(context.Background()).Tags(tags).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.FindPetsByTags``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -304,7 +304,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.GetPetById(context.Background(), petId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.GetPetById``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -372,7 +372,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UpdatePet(context.Background()).Pet(pet).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UpdatePet``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -436,7 +436,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UpdatePetWithForm(context.Background(), petId).Name(name).Status(status).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UpdatePetWithForm``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -506,7 +506,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UploadFile(context.Background(), petId).AdditionalMetadata(additionalMetadata).File(file).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UploadFile``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -578,7 +578,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.PetApi.UploadFileWithRequiredFile(context.Background(), petId).RequiredFile(requiredFile).AdditionalMetadata(additionalMetadata).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `PetApi.UploadFileWithRequiredFile``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/StoreApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/StoreApi.md index a94618d626be..067ea3825762 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/StoreApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/StoreApi.md @@ -37,7 +37,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.DeleteOrder(context.Background(), orderId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.DeleteOrder``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -104,7 +104,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.GetInventory(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.GetInventory``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -166,7 +166,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.GetOrderById(context.Background(), orderId).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.GetOrderById``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -234,7 +234,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.StoreApi.PlaceOrder(context.Background()).Order(order).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `StoreApi.PlaceOrder``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/UserApi.md b/samples/openapi3/client/petstore/go/go-petstore/docs/UserApi.md index df784307bd0d..dbbbe3fa792e 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/docs/UserApi.md +++ b/samples/openapi3/client/petstore/go/go-petstore/docs/UserApi.md @@ -41,7 +41,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUser(context.Background()).User(user).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -103,7 +103,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUsersWithArrayInput(context.Background()).User(user).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUsersWithArrayInput``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -165,7 +165,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.CreateUsersWithListInput(context.Background()).User(user).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.CreateUsersWithListInput``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -229,7 +229,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.DeleteUser(context.Background(), username).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.DeleteUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -295,7 +295,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.GetUserByName(context.Background(), username).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.GetUserByName``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -364,7 +364,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.LoginUser(context.Background()).Username(username).Password(password).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.LoginUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -428,7 +428,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.LogoutUser(context.Background()).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.LogoutUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } @@ -489,7 +489,7 @@ func main() { configuration := openapiclient.NewConfiguration() api_client := openapiclient.NewAPIClient(configuration) resp, r, err := api_client.UserApi.UpdateUser(context.Background(), username).User(user).Execute() - if err.Error() != "" { + if err != nil { fmt.Fprintf(os.Stderr, "Error when calling `UserApi.UpdateUser``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } diff --git a/samples/openapi3/client/petstore/go/http_signature_test.go b/samples/openapi3/client/petstore/go/http_signature_test.go index 1561c6d8ddf9..6348599111a6 100644 --- a/samples/openapi3/client/petstore/go/http_signature_test.go +++ b/samples/openapi3/client/petstore/go/http_signature_test.go @@ -282,11 +282,11 @@ func executeHttpSignatureAuth(t *testing.T, authConfig *sw.HttpSignatureAuth, ex authConfig.SigningScheme, authConfig.SigningAlgorithm, authConfig.SignatureMaxValidity, authConfig.SignedHeaders) r, err2 := apiClient.PetApi.AddPet(authCtx).Pet(newPet).Execute() - if expectSuccess && err2.Error() != "" { + if expectSuccess && err2 != nil { t.Fatalf("Error while adding pet: %v", err2) } if !expectSuccess { - if err2.Error() == "" { + if err2 == nil { t.Fatalf("Error was expected, but no error was generated") } else { // Do not continue. Error is expected. @@ -298,7 +298,7 @@ func executeHttpSignatureAuth(t *testing.T, authConfig *sw.HttpSignatureAuth, ex } _, r, err = apiClient.PetApi.GetPetById(authCtx, 12992).Execute() - if expectSuccess && err.Error() != "" { + if expectSuccess && err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } diff --git a/samples/openapi3/client/petstore/go/pet_api_test.go b/samples/openapi3/client/petstore/go/pet_api_test.go index 999d06fa9b9f..9f0a154f96a0 100644 --- a/samples/openapi3/client/petstore/go/pet_api_test.go +++ b/samples/openapi3/client/petstore/go/pet_api_test.go @@ -33,7 +33,7 @@ func TestAddPet(t *testing.T) { r, err := client.PetApi.AddPet(context.Background()).Pet(newPet).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding pet: %v", err) } if r.StatusCode != 200 { @@ -44,7 +44,7 @@ func TestAddPet(t *testing.T) { func TestFindPetsByStatusWithMissingParam(t *testing.T) { _, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status(nil).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while testing TestFindPetsByStatusWithMissingParam: %v", err) } if r.StatusCode != 200 { @@ -59,12 +59,13 @@ func TestGetPetById(t *testing.T) { func TestGetPetByIdWithInvalidID(t *testing.T) { resp, r, err := client.PetApi.GetPetById(context.Background(), 999999999).Execute() if r != nil && r.StatusCode == 404 { - assertedError:= err + assertedError, ok := err.(sw.GenericOpenAPIError) a := assert.New(t) + a.True(ok) a.Contains(string(assertedError.Body()), "type") a.Contains(assertedError.Error(), "Not Found") - } else if err.Error() != "" { + } else if err != nil { t.Fatalf("Error while getting pet by invalid id: %v", err) t.Log(r) } else { @@ -74,7 +75,7 @@ func TestGetPetByIdWithInvalidID(t *testing.T) { func TestUpdatePetWithForm(t *testing.T) { r, err := client.PetApi.UpdatePetWithForm(context.Background(), 12830).Name("golang").Status("available").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while updating pet by id: %v", err) t.Log(r) } @@ -89,7 +90,7 @@ func TestUpdatePetWithForm(t *testing.T) { func TestFindPetsByTag(t *testing.T) { var found = false resp, r, err := client.PetApi.FindPetsByTags(context.Background()).Tags([]string{"tag2"}).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by tag: %v", err) t.Log(r) } else { @@ -118,7 +119,7 @@ func TestFindPetsByTag(t *testing.T) { func TestFindPetsByStatus(t *testing.T) { resp, r, err := client.PetApi.FindPetsByStatus(context.Background()).Status([]string{"available"}).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by id: %v", err) t.Log(r) } else { @@ -145,7 +146,7 @@ func TestUploadFile(t *testing.T) { _, r, err := client.PetApi.UploadFile(context.Background(), 12830).AdditionalMetadata("golang").File(file).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while uploading file: %v", err) } @@ -163,7 +164,7 @@ func TestUploadFileRequired(t *testing.T) { _, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830).RequiredFile(file).AdditionalMetadata("golang").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while uploading file: %v", err) } @@ -175,7 +176,7 @@ func TestUploadFileRequired(t *testing.T) { func TestDeletePet(t *testing.T) { r, err := client.PetApi.DeletePet(context.Background(), 12830).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -265,7 +266,7 @@ func waitOnFunctions(t *testing.T, errc chan error, n int) { func deletePet(t *testing.T, id int64) { r, err := client.PetApi.DeletePet(context.Background(), id).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting pet by id: %v", err) } if r.StatusCode != 200 { @@ -276,7 +277,7 @@ func deletePet(t *testing.T, id int64) { func isPetCorrect(t *testing.T, id int64, name string, status string) { assert := assert.New(t) resp, r, err := client.PetApi.GetPetById(context.Background(), id).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting pet by id: %v", err) } else { assert.Equal(*resp.Id, int64(id), "Pet id should be equal") diff --git a/samples/openapi3/client/petstore/go/store_api_test.go b/samples/openapi3/client/petstore/go/store_api_test.go index 0fb6cdaa0a69..fc0cdec9699a 100644 --- a/samples/openapi3/client/petstore/go/store_api_test.go +++ b/samples/openapi3/client/petstore/go/store_api_test.go @@ -20,7 +20,7 @@ func TestPlaceOrder(t *testing.T) { _, r, err := client.StoreApi.PlaceOrder(context.Background()).Order(newOrder).Execute() - if err.Error() != "" { + if err != nil { // Skip parsing time error due to error in Petstore Test Server // https://github.com/OpenAPITools/openapi-generator/issues/1292 if regexp. diff --git a/samples/openapi3/client/petstore/go/user_api_test.go b/samples/openapi3/client/petstore/go/user_api_test.go index 918221e1c857..ef66e2410c06 100644 --- a/samples/openapi3/client/petstore/go/user_api_test.go +++ b/samples/openapi3/client/petstore/go/user_api_test.go @@ -22,7 +22,7 @@ func TestCreateUser(t *testing.T) { apiResponse, err := client.UserApi.CreateUser(context.Background()).User(newUser).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding user: %v", err) } if apiResponse.StatusCode != 200 { @@ -56,7 +56,7 @@ func TestCreateUsersWithArrayInput(t *testing.T) { } apiResponse, err := client.UserApi.CreateUsersWithArrayInput(context.Background()).User(newUsers).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while adding users: %v", err) } if apiResponse.StatusCode != 200 { @@ -83,7 +83,7 @@ func TestGetUserByName(t *testing.T) { assert := assert.New(t) resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting user by id: %v", err) } else { assert.Equal(*resp.Id, int64(1000), "User id should be equal") @@ -100,7 +100,7 @@ func TestGetUserByNameWithInvalidID(t *testing.T) { resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "999999999").Execute() if apiResponse != nil && apiResponse.StatusCode == 404 { return // This is a pass condition. API will return with a 404 error. - } else if err.Error() != "" { + } else if err != nil { t.Fatalf("Error while getting user by invalid id: %v", err) t.Log(apiResponse) } else { @@ -125,7 +125,7 @@ func TestUpdateUser(t *testing.T) { UserStatus: sw.PtrInt32(1)} apiResponse, err := client.UserApi.UpdateUser(context.Background(), "gopher").User(newUser).Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while deleting user by id: %v", err) } if apiResponse.StatusCode != 200 { @@ -134,7 +134,7 @@ func TestUpdateUser(t *testing.T) { //verify changings are correct resp, apiResponse, err := client.UserApi.GetUserByName(context.Background(), "gopher").Execute() - if err.Error() != "" { + if err != nil { t.Fatalf("Error while getting user by id: %v", err) } else { assert.Equal(*resp.Id, int64(1000), "User id should be equal") From a3952b2beb4c5dd66fd445e59b666c54b6c8355c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 Jan 2021 14:14:51 +0800 Subject: [PATCH 14/23] Add a link to the blog post in nginx blog (#8438) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7ea36a530a8d..1a12fb8b9280 100644 --- a/README.md +++ b/README.md @@ -808,6 +808,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - 2020-12-01 - [OpenAPI GeneratorでGoのAPIサーバー/クライアントコードを自動生成する](https://qiita.com/saki-engineering/items/b20d8b6074c4da9664a5) by [@saki-engineering](https://qiita.com/saki-engineering) - 2020-12-09 - [プロジェクトにOpenAPI Generatorで自動生成された型付きAPI Clientを導入した話](https://qiita.com/yoshifujiT/items/905c18700ede23f40840) by [@yoshifujiT](https://github.com/yoshifujiT) - 2020-12-15 - [Next.js + NestJS + GraphQLで変化に追従するフロントエンドへ 〜 ショッピングクーポンの事例紹介](https://techblog.yahoo.co.jp/entry/2020121530052952/) by [小倉 陸](https://github.com/ogugu9) at [Yahoo! JAPAN Tech Blog](https://techblog.yahoo.co.jp/) +- 2021-01-08 - [Hello, New API – Part 1](https://www.nginx.com/blog/hello-new-api-part-1/) by [Jeremy Schulman](https://www.nginx.com/people/jeremy-schulman/) at [Major League Baseball](https://www.mlb.com) ## [6 - About Us](#table-of-contents) From 32b01cb39bea5bc0d006e9d31d41afedf4dcab29 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 Jan 2021 16:07:38 +0800 Subject: [PATCH 15/23] comment out rust server tests (#8440) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1213adf3b321..79d7cf93da15 100644 --- a/pom.xml +++ b/pom.xml @@ -1189,7 +1189,7 @@ samples/server/petstore/php-slim4 samples/server/petstore/php-laravel samples/server/petstore/php-lumen - samples/server/petstore/rust-server + From e2ad6dbc1ba1ad23e760dc92764a10feab63a807 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 14 Jan 2021 23:32:19 +0800 Subject: [PATCH 16/23] [Go] Fix response body (#8439) * fix go response body * add missing import --- .../src/main/resources/go/api.mustache | 2 ++ .../petstore/go/go-petstore/api_another_fake.go | 2 ++ .../client/petstore/go/go-petstore/api_fake.go | 15 +++++++++++++++ .../go/go-petstore/api_fake_classname_tags123.go | 2 ++ samples/client/petstore/go/go-petstore/api_pet.go | 10 ++++++++++ .../client/petstore/go/go-petstore/api_store.go | 5 +++++ .../client/petstore/go/go-petstore/api_user.go | 9 +++++++++ .../x-auth-id-alias/go-experimental/api_usage.go | 5 +++++ .../petstore/go/go-petstore/api_another_fake.go | 2 ++ .../client/petstore/go/go-petstore/api_default.go | 2 ++ .../client/petstore/go/go-petstore/api_fake.go | 15 +++++++++++++++ .../go/go-petstore/api_fake_classname_tags123.go | 2 ++ .../client/petstore/go/go-petstore/api_pet.go | 10 ++++++++++ .../client/petstore/go/go-petstore/api_store.go | 5 +++++ .../client/petstore/go/go-petstore/api_user.go | 9 +++++++++ 15 files changed, 95 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache index 5486bde9dde0..c68db2553865 100644 --- a/modules/openapi-generator/src/main/resources/go/api.mustache +++ b/modules/openapi-generator/src/main/resources/go/api.mustache @@ -3,6 +3,7 @@ package {{packageName}} {{#operations}} import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -322,6 +323,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_another_fake.go b/samples/client/petstore/go/go-petstore/api_another_fake.go index 56c9345d5e32..f97f8b7bcb18 100644 --- a/samples/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/client/petstore/go/go-petstore/api_another_fake.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -129,6 +130,7 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go index 92ef1bf22fcb..286d8c357ef1 100644 --- a/samples/client/petstore/go/go-petstore/api_fake.go +++ b/samples/client/petstore/go/go-petstore/api_fake.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -303,6 +304,7 @@ func (a *FakeApiService) CreateXmlItemExecute(r ApiCreateXmlItemRequest) (*_neth localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -402,6 +404,7 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -510,6 +513,7 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -618,6 +622,7 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -726,6 +731,7 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -835,6 +841,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -943,6 +950,7 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1045,6 +1053,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1283,6 +1292,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1437,6 +1447,7 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1578,6 +1589,7 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1677,6 +1689,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1784,6 +1797,7 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1929,6 +1943,7 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go index c032657de757..967fd856e41c 100644 --- a/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -143,6 +144,7 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go index da68df83dda0..73cf522a982b 100644 --- a/samples/client/petstore/go/go-petstore/api_pet.go +++ b/samples/client/petstore/go/go-petstore/api_pet.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -235,6 +236,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, e localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -336,6 +338,7 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -437,6 +440,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -547,6 +551,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -666,6 +671,7 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -774,6 +780,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -883,6 +890,7 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1002,6 +1010,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1130,6 +1139,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_store.go b/samples/client/petstore/go/go-petstore/api_store.go index 0b5853274dd6..e3120f0b246f 100644 --- a/samples/client/petstore/go/go-petstore/api_store.go +++ b/samples/client/petstore/go/go-petstore/api_store.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -164,6 +165,7 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -270,6 +272,7 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -381,6 +384,7 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -491,6 +495,7 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/client/petstore/go/go-petstore/api_user.go b/samples/client/petstore/go/go-petstore/api_user.go index 6f8185f704bd..7e6d6991b800 100644 --- a/samples/client/petstore/go/go-petstore/api_user.go +++ b/samples/client/petstore/go/go-petstore/api_user.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -218,6 +219,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -317,6 +319,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -416,6 +419,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -510,6 +514,7 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -605,6 +610,7 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -723,6 +729,7 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -821,6 +828,7 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -925,6 +933,7 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go index cb0ea16b894a..7afd8dc09c22 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/api_usage.go @@ -11,6 +11,7 @@ package x_auth_id_alias import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -130,6 +131,7 @@ func (a *UsageApiService) AnyKeyExecute(r ApiAnyKeyRequest) (map[string]interfac localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -259,6 +261,7 @@ func (a *UsageApiService) BothKeysExecute(r ApiBothKeysRequest) (map[string]inte localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -374,6 +377,7 @@ func (a *UsageApiService) KeyInHeaderExecute(r ApiKeyInHeaderRequest) (map[strin localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -489,6 +493,7 @@ func (a *UsageApiService) KeyInQueryExecute(r ApiKeyInQueryRequest) (map[string] localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go index 497c6629b055..dea9b0888f97 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_another_fake.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -129,6 +130,7 @@ func (a *AnotherFakeApiService) Call123TestSpecialTagsExecute(r ApiCall123TestSp localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_default.go b/samples/openapi3/client/petstore/go/go-petstore/api_default.go index b9a217a0efe6..df07b59b2a79 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_default.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_default.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -117,6 +118,7 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (InlineResponseDef localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go index fc9fb9b597e3..c7d9644d638b 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -295,6 +296,7 @@ func (a *FakeApiService) FakeHealthGetExecute(r ApiFakeHealthGetRequest) (Health localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -403,6 +405,7 @@ func (a *FakeApiService) FakeOuterBooleanSerializeExecute(r ApiFakeOuterBooleanS localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -511,6 +514,7 @@ func (a *FakeApiService) FakeOuterCompositeSerializeExecute(r ApiFakeOuterCompos localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -619,6 +623,7 @@ func (a *FakeApiService) FakeOuterNumberSerializeExecute(r ApiFakeOuterNumberSer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -727,6 +732,7 @@ func (a *FakeApiService) FakeOuterStringSerializeExecute(r ApiFakeOuterStringSer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -836,6 +842,7 @@ func (a *FakeApiService) TestBodyWithFileSchemaExecute(r ApiTestBodyWithFileSche localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -944,6 +951,7 @@ func (a *FakeApiService) TestBodyWithQueryParamsExecute(r ApiTestBodyWithQueryPa localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1046,6 +1054,7 @@ func (a *FakeApiService) TestClientModelExecute(r ApiTestClientModelRequest) (Cl localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1285,6 +1294,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1447,6 +1457,7 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1588,6 +1599,7 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1687,6 +1699,7 @@ func (a *FakeApiService) TestInlineAdditionalPropertiesExecute(r ApiTestInlineAd localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1794,6 +1807,7 @@ func (a *FakeApiService) TestJsonFormDataExecute(r ApiTestJsonFormDataRequest) ( localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1949,6 +1963,7 @@ func (a *FakeApiService) TestQueryParameterCollectionFormatExecute(r ApiTestQuer localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go index 3ec0cd5efc74..f60d6c06e2d0 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake_classname_tags123.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -143,6 +144,7 @@ func (a *FakeClassnameTags123ApiService) TestClassnameExecute(r ApiTestClassname localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go index de2a7cca8b29..06bddb5dc12e 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -235,6 +236,7 @@ func (a *PetApiService) AddPetExecute(r ApiAddPetRequest) (*_nethttp.Response, e localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -336,6 +338,7 @@ func (a *PetApiService) DeletePetExecute(r ApiDeletePetRequest) (*_nethttp.Respo localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -437,6 +440,7 @@ func (a *PetApiService) FindPetsByStatusExecute(r ApiFindPetsByStatusRequest) ([ localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -547,6 +551,7 @@ func (a *PetApiService) FindPetsByTagsExecute(r ApiFindPetsByTagsRequest) ([]Pet localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -666,6 +671,7 @@ func (a *PetApiService) GetPetByIdExecute(r ApiGetPetByIdRequest) (Pet, *_nethtt localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -774,6 +780,7 @@ func (a *PetApiService) UpdatePetExecute(r ApiUpdatePetRequest) (*_nethttp.Respo localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -883,6 +890,7 @@ func (a *PetApiService) UpdatePetWithFormExecute(r ApiUpdatePetWithFormRequest) localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -1002,6 +1010,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (ApiResponse, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -1130,6 +1139,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_store.go b/samples/openapi3/client/petstore/go/go-petstore/api_store.go index 685b6ed0fd17..3f85de0a9d6b 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_store.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_store.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -164,6 +165,7 @@ func (a *StoreApiService) DeleteOrderExecute(r ApiDeleteOrderRequest) (*_nethttp localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -270,6 +272,7 @@ func (a *StoreApiService) GetInventoryExecute(r ApiGetInventoryRequest) (map[str localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -381,6 +384,7 @@ func (a *StoreApiService) GetOrderByIdExecute(r ApiGetOrderByIdRequest) (Order, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -491,6 +495,7 @@ func (a *StoreApiService) PlaceOrderExecute(r ApiPlaceOrderRequest) (Order, *_ne localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_user.go b/samples/openapi3/client/petstore/go/go-petstore/api_user.go index 7246b5737854..a844934ae982 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api_user.go +++ b/samples/openapi3/client/petstore/go/go-petstore/api_user.go @@ -11,6 +11,7 @@ package petstore import ( + "bytes" _context "context" _ioutil "io/ioutil" _nethttp "net/http" @@ -218,6 +219,7 @@ func (a *UserApiService) CreateUserExecute(r ApiCreateUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -317,6 +319,7 @@ func (a *UserApiService) CreateUsersWithArrayInputExecute(r ApiCreateUsersWithAr localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -416,6 +419,7 @@ func (a *UserApiService) CreateUsersWithListInputExecute(r ApiCreateUsersWithLis localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -510,6 +514,7 @@ func (a *UserApiService) DeleteUserExecute(r ApiDeleteUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -605,6 +610,7 @@ func (a *UserApiService) GetUserByNameExecute(r ApiGetUserByNameRequest) (User, localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -723,6 +729,7 @@ func (a *UserApiService) LoginUserExecute(r ApiLoginUserRequest) (string, *_neth localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarReturnValue, localVarHTTPResponse, err } @@ -821,6 +828,7 @@ func (a *UserApiService) LogoutUserExecute(r ApiLogoutUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } @@ -925,6 +933,7 @@ func (a *UserApiService) UpdateUserExecute(r ApiUpdateUserRequest) (*_nethttp.Re localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) if err != nil { return localVarHTTPResponse, err } From dfcd86f35afe6cdfffb8ce77e74e66cd9caa4890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Cenu=C8=99=C4=83?= Date: Thu, 14 Jan 2021 21:03:20 +0200 Subject: [PATCH 17/23] [typescript-axios] bump axios version to 0.21.1 to fix vulnerability (#8445) * fix(typescript-axios): updated axios dependency to new minor version 0.21.1 * fix(typescript-axios): update samples --- .../src/main/resources/typescript-axios/package.mustache | 2 +- .../petstore/typescript-axios/builds/es6-target/package.json | 2 +- .../with-npm-version-and-separate-models-and-api/package.json | 2 +- .../typescript-axios/builds/with-npm-version/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache index da07d370fa4e..6c6114ebcf04 100644 --- a/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-axios/package.mustache @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "axios": "^0.19.2" + "axios": "^0.21.1" }, "devDependencies": { "@types/node": "^12.11.5", diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/package.json b/samples/client/petstore/typescript-axios/builds/es6-target/package.json index a45d2102eae3..4bdd4b5017d8 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/package.json +++ b/samples/client/petstore/typescript-axios/builds/es6-target/package.json @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "axios": "^0.19.2" + "axios": "^0.21.1" }, "devDependencies": { "@types/node": "^12.11.5", diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json index a45d2102eae3..4bdd4b5017d8 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "axios": "^0.19.2" + "axios": "^0.21.1" }, "devDependencies": { "@types/node": "^12.11.5", diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json b/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json index a45d2102eae3..4bdd4b5017d8 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/package.json @@ -18,7 +18,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "axios": "^0.19.2" + "axios": "^0.21.1" }, "devDependencies": { "@types/node": "^12.11.5", From e78183abdeea8ed342945c8bb27a86c75e335c0e Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Fri, 15 Jan 2021 12:24:08 +0200 Subject: [PATCH 18/23] Clarify PR instructions regarding @mentioning the technical committee (#8381) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1f9808ab5719..32dfafa63a2e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,4 +17,4 @@ You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/). - [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `5.1.x`, `6.0.x` -- [ ] Copy the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language. +- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request. From a4b356c8b392c39508ac441d79783f2b7ce6e5e1 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 15 Jan 2021 22:00:01 +0800 Subject: [PATCH 19/23] fix typo (#8452) --- .../main/java/org/openapitools/codegen/CodegenConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 1601882e0cd5..b66b232129f2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -226,7 +226,7 @@ public class CodegenConstants { public static final String API_NAME_PREFIX_DESC = "Prefix that will be appended to all API names ('tags'). Default: empty string. e.g. Pet => Pet."; public static final String API_NAME_SUFFIX = "apiNameSuffix"; - public static final String API_NAME_SUFFIX_DESC = "Suffix that will be appended to all API names ('tags'). Default: Api. e.g. Pet => PetApi. Note: Only ruby, python, jaxrs generators suppport this feature at the moment."; + public static final String API_NAME_SUFFIX_DESC = "Suffix that will be appended to all API names ('tags'). Default: Api. e.g. Pet => PetApi. Note: Only ruby, python, jaxrs generators support this feature at the moment."; public static final String MODEL_NAME_PREFIX = "modelNamePrefix"; public static final String MODEL_NAME_PREFIX_DESC = "Prefix that will be prepended to all model names."; From 99144252f76445014a022291a642f0c6633b1b7e Mon Sep 17 00:00:00 2001 From: Toby Murray Date: Fri, 15 Jan 2021 09:32:50 -0500 Subject: [PATCH 20/23] Migrate off deprecate Gradle configurations (#8436) A bunch of gradle configurations have been deprecated, with drop in replacements. Relevant to this project: compile -> implementation testCompile -> testImplementation They're visible by executing e.g. ./gradlew build --warning-mode all with supporting documentation here: https://docs.gradle.org/6.6.1/userguide/upgrading_version_5.html#dependencies_should_no_longer_be_declared_using_the_compile_and_runtime_configurations --- .../main/resources/Java/build.gradle.mustache | 30 +++++------ .../libraries/feign/build.gradle.mustache | 34 ++++++------ .../google-api-client/build.gradle.mustache | 32 ++++++------ .../libraries/jersey2/build.gradle.mustache | 42 +++++++-------- .../libraries/native/build.gradle.mustache | 22 ++++---- .../okhttp-gson/build.gradle.mustache | 26 +++++----- .../rest-assured/build.gradle.mustache | 42 +++++++-------- .../libraries/resteasy/build.gradle.mustache | 36 ++++++------- .../resttemplate/build.gradle.mustache | 32 ++++++------ .../libraries/retrofit/build.gradle.mustache | 18 +++---- .../libraries/retrofit2/build.gradle.mustache | 52 +++++++++---------- .../libraries/vertx/build.gradle.mustache | 28 +++++----- .../libraries/webclient/build.gradle.mustache | 30 +++++------ .../libraries/jersey2/build.gradle.mustache | 28 +++++----- .../java/feign-no-nullable/build.gradle | 28 +++++----- .../client/petstore/java/feign/build.gradle | 30 +++++------ .../java/google-api-client/build.gradle | 24 ++++----- .../client/petstore/java/jersey1/build.gradle | 26 +++++----- .../petstore/java/jersey2-java8/build.gradle | 30 +++++------ .../petstore/java/native-async/build.gradle | 20 +++---- .../client/petstore/java/native/build.gradle | 20 +++---- .../build.gradle | 24 ++++----- .../okhttp-gson-parcelableModel/build.gradle | 22 ++++---- .../petstore/java/okhttp-gson/build.gradle | 22 ++++---- .../java/rest-assured-jackson/build.gradle | 28 +++++----- .../petstore/java/rest-assured/build.gradle | 22 ++++---- .../petstore/java/resteasy/build.gradle | 30 +++++------ .../java/resttemplate-withXml/build.gradle | 26 +++++----- .../petstore/java/resttemplate/build.gradle | 24 ++++----- .../java/retrofit2-play26/build.gradle | 36 ++++++------- .../petstore/java/retrofit2/build.gradle | 20 +++---- .../petstore/java/retrofit2rx2/build.gradle | 24 ++++----- .../petstore/java/retrofit2rx3/build.gradle | 24 ++++----- .../java/vertx-no-nullable/build.gradle | 24 ++++----- .../client/petstore/java/vertx/build.gradle | 24 ++++----- .../petstore/java/webclient/build.gradle | 26 +++++----- .../java/jersey2-java8/build.gradle | 30 +++++------ .../build.gradle | 28 +++++----- .../petstore/java/jersey2-java8/build.gradle | 32 ++++++------ .../client/petstore/java/native/build.gradle | 20 +++---- 40 files changed, 558 insertions(+), 558 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache index 4f408644a9bd..0982932dfb0e 100644 --- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache @@ -150,30 +150,30 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.sun.jersey:jersey-client:$jersey_version" - compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.sun.jersey:jersey-client:$jersey_version" + implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" {{/threetenbp}} {{^java8}} - compile "com.brsanthu:migbase64:2.2" + implementation "com.brsanthu:migbase64:2.2" {{/java8}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache index 3f9664b221a4..3e00fb917976 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache @@ -135,29 +135,29 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.github.openfeign:feign-core:$feign_version" - compile "io.github.openfeign:feign-jackson:$feign_version" - compile "io.github.openfeign:feign-slf4j:$feign_version" - compile "io.github.openfeign.form:feign-form:$feign_form_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.github.openfeign:feign-core:$feign_version" + implementation "io.github.openfeign:feign-jackson:$feign_version" + implementation "io.github.openfeign:feign-slf4j:$feign_version" + implementation "io.github.openfeign.form:feign-form:$feign_form_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" {{/threetenbp}} - compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache index 6537bf62f991..496ff42fccea 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache @@ -135,30 +135,30 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.google.api-client:google-api-client:${google_api_client_version}" - compile "org.glassfish.jersey.core:jersey-common:${jersey_common_version}" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.google.api-client:google-api-client:${google_api_client_version}" + implementation "org.glassfish.jersey.core:jersey-common:${jersey_common_version}" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" - compile "joda-time:joda-time:$jodatime_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "joda-time:joda-time:$jodatime_version" {{/joda}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" {{/threetenbp}} {{#withXml}} - compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" {{/withXml}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache index 392c3fda0b26..9292d599cad1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache @@ -145,43 +145,43 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#hasOAuthMethods}} - compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" {{/hasOAuthMethods}} {{#hasHttpSignatureMethods}} - compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" + implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" {{/hasHttpSignatureMethods}} {{#supportJava6}} - compile "commons-io:commons-io:$commons_io_version" - compile "org.apache.commons:commons-lang3:$commons_lang3_version" + implementation "commons-io:commons-io:$commons_io_version" + implementation "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" {{/threetenbp}} {{^java8}} - compile "com.brsanthu:migbase64:2.2" + implementation "com.brsanthu:migbase64:2.2" {{/java8}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } javadoc { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache index 312d1f5db1f6..e1967261a114 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache @@ -60,17 +60,17 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:0.2.1" - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:0.2.1" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" {{/threetenbp}} - testCompile "junit:junit:$junit_version" + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache index 8f10fd4e7281..104fe6d0ff15 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache @@ -126,27 +126,27 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.24' - compile "com.google.code.findbugs:jsr305:3.0.2" - compile 'com.squareup.okhttp3:okhttp:3.14.7' - compile 'com.squareup.okhttp3:logging-interceptor:3.14.7' - compile 'com.google.code.gson:gson:2.8.6' - compile 'io.gsonfire:gson-fire:1.8.4' + implementation 'io.swagger:swagger-annotations:1.5.24' + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation 'com.squareup.okhttp3:okhttp:3.14.7' + implementation 'com.squareup.okhttp3:logging-interceptor:3.14.7' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'io.gsonfire:gson-fire:1.8.4' {{#hasOAuthMethods}} - compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' + implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' {{/hasOAuthMethods}} - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' {{#joda}} - compile 'joda-time:joda-time:2.9.9' + implementation 'joda-time:joda-time:2.9.9' {{/joda}} {{#threetenbp}} - compile 'org.threeten:threetenbp:1.4.3' + implementation 'org.threeten:threetenbp:1.4.3' {{/threetenbp}} {{#dynamicOperations}} - compile 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' + implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' {{/dynamicOperations}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile 'junit:junit:4.13.1' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation 'junit:junit:4.13.1' } javadoc { diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache index 47d9a13ea3e5..28c213b41b7f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache @@ -122,47 +122,47 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.rest-assured:rest-assured:$rest_assured_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.rest-assured:rest-assured:$rest_assured_version" {{#jackson}} - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#withXml}} - compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" {{/withXml}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" {{/threetenbp}} {{/jackson}} {{#gson}} - compile "io.gsonfire:gson-fire:$gson_fire_version" - compile 'com.google.code.gson:gson:$gson_version' + implementation "io.gsonfire:gson-fire:$gson_fire_version" + implementation 'com.google.code.gson:gson:$gson_version' {{/gson}} {{#joda}} - compile "joda-time:joda-time:$jodatime_version" + implementation "joda-time:joda-time:$jodatime_version" {{/joda}} {{#threetenbp}} - compile "org.threeten:threetenbp:$threetenbp_version" + implementation "org.threeten:threetenbp:$threetenbp_version" {{/threetenbp}} - compile "com.squareup.okio:okio:$okio_version" + implementation "com.squareup.okio:okio:$okio_version" {{#useBeanValidation}} - compile "javax.validation:validation-api:2.0.1.Final" + implementation "javax.validation:validation-api:2.0.1.Final" {{/useBeanValidation}} {{#performBeanValidation}} - compile "org.hibernate:hibernate-validator:6.0.19.Final" + implementation "org.hibernate:hibernate-validator:6.0.19.Final" {{/performBeanValidation}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache index e2b6913c672d..ed3020519df8 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache @@ -137,30 +137,30 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.jboss.resteasy:resteasy-client:$resteasy_version" - compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version" - compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.jboss.resteasy:resteasy-client:$resteasy_version" + implementation "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version" + implementation "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{^java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" - compile "joda-time:joda-time:$jodatime_version" - compile "com.brsanthu:migbase64:2.2" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "joda-time:joda-time:$jodatime_version" + implementation "com.brsanthu:migbase64:2.2" {{/java8}} {{#supportJava6}} - compile "commons-io:commons-io:$commons_io_version" - compile "org.apache.commons:commons-lang3:$commons_lang3_version" + implementation "commons-io:commons-io:$commons_io_version" + implementation "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache index 57606f073111..d41aa90de153 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache @@ -134,30 +134,30 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.springframework:spring-web:$spring_web_version" - compile "org.springframework:spring-context:$spring_web_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" - compile "joda-time:joda-time:$jodatime_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "joda-time:joda-time:$jodatime_version" {{/joda}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" {{/threetenbp}} {{#withXml}} - compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" {{/withXml}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache index 14ce3d1dafdc..cd1096e5723c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache @@ -119,15 +119,15 @@ ext { } dependencies { - compile "com.squareup.okhttp:okhttp:$okhttp_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.squareup.retrofit:retrofit:$retrofit_version" - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" - compile "joda-time:joda-time:$jodatime_version" + implementation "com.squareup.okhttp:okhttp:$okhttp_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.squareup.retrofit:retrofit:$retrofit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + implementation "joda-time:joda-time:$jodatime_version" {{#threetenbp}} - compile "org.threeten:threetenbp:$threetenbp_version" + implementation "org.threeten:threetenbp:$threetenbp_version" {{/threetenbp}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache index 3ea42a41dc39..517d6a4e8441 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache @@ -158,50 +158,50 @@ ext { } dependencies { - compile "com.squareup.retrofit2:retrofit:$retrofit_version" - compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" - compile "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" {{#useRxJava}} - compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" - compile "io.reactivex:rxjava:$rx_java_version" + implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" + implementation "io.reactivex:rxjava:$rx_java_version" {{/useRxJava}} {{#useRxJava2}} - compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' - compile "io.reactivex.rxjava2:rxjava:$rx_java_version" + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' + implementation "io.reactivex.rxjava2:rxjava:$rx_java_version" {{/useRxJava2}} {{#useRxJava3}} - compile 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' - compile "io.reactivex.rxjava3:rxjava:$rx_java_version" + implementation 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' + implementation "io.reactivex.rxjava3:rxjava:$rx_java_version" {{/useRxJava3}} - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' } - compile "io.gsonfire:gson-fire:$json_fire_version" + implementation "io.gsonfire:gson-fire:$json_fire_version" {{#joda}} - compile "joda-time:joda-time:$jodatime_version" + implementation "joda-time:joda-time:$jodatime_version" {{/joda}} {{#threetenbp}} - compile "org.threeten:threetenbp:$threetenbp_version" + implementation "org.threeten:threetenbp:$threetenbp_version" {{/threetenbp}} {{#usePlayWS}} {{#play26}} - compile "com.typesafe.play:play-ahc-ws_2.12:$play_version" - compile "javax.validation:validation-api:1.1.0.Final" + implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" + implementation "javax.validation:validation-api:1.1.0.Final" {{/play26}} {{^play26}} - compile "com.typesafe.play:play-java-ws_2.11:$play_version" + implementation "com.typesafe.play:play-java-ws_2.11:$play_version" {{/play26}} - compile "com.squareup.retrofit2:converter-jackson:$retrofit_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version" {{/usePlayWS}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache index 3166da0d84aa..cb2910c8430a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache @@ -41,26 +41,26 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.vertx:vertx-web-client:$vertx_version" - compile "io.vertx:vertx-rx-java:$vertx_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.vertx:vertx-web-client:$vertx_version" + implementation "io.vertx:vertx-rx-java:$vertx_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" {{#joda}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{#threetenbp}} - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:jackson_threeten_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:jackson_threeten_version" {{/threetenbp}} {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" - testCompile "io.vertx:vertx-unit:$vertx_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" + testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index f6c8ac6438cc..028d9e5cc510 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -150,28 +150,28 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.projectreactor:reactor-core:$reactor_version" - compile "org.springframework:spring-webflux:$spring_web_version" - compile "io.projectreactor.ipc:reactor-netty:$reactor_netty_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.projectreactor:reactor-core:$reactor_version" + implementation "org.springframework:spring-webflux:$spring_web_version" + implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" {{#openApiNullable}} - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" {{/openApiNullable}} {{#joda}} - compile "joda-time:joda-time:$jodatime_version" + implementation "joda-time:joda-time:$jodatime_version" {{/joda}} {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{^java8}} - compile "com.brsanthu:migbase64:2.2" + implementation "com.brsanthu:migbase64:2.2" {{/java8}} - compile "javax.annotation:javax.annotation-api:$javax_annotation_version" - testCompile "junit:junit:$junit_version" + implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + testImplementation "junit:junit:$junit_version" } diff --git a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache index 9d25bfaa828f..c76ec3218088 100644 --- a/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache +++ b/modules/openapi-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache @@ -133,24 +133,24 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" {{#java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" {{/java8}} {{^java8}} - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" - compile "joda-time:joda-time:$jodatime_version" - compile "com.brsanthu:migbase64:2.2" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "joda-time:joda-time:$jodatime_version" + implementation "com.brsanthu:migbase64:2.2" {{/java8}} {{#supportJava6}} - compile "commons-io:commons-io:$commons_io_version" - compile "org.apache.commons:commons-lang3:$commons_lang3_version" + implementation "commons-io:commons-io:$commons_io_version" + implementation "org.apache.commons:commons-lang3:$commons_lang3_version" {{/supportJava6}} - testCompile "junit:junit:$junit_version" + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/feign-no-nullable/build.gradle b/samples/client/petstore/java/feign-no-nullable/build.gradle index 75fe013bae28..714dcc365b1f 100644 --- a/samples/client/petstore/java/feign-no-nullable/build.gradle +++ b/samples/client/petstore/java/feign-no-nullable/build.gradle @@ -106,18 +106,18 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.github.openfeign:feign-core:$feign_version" - compile "io.github.openfeign:feign-jackson:$feign_version" - compile "io.github.openfeign:feign-slf4j:$feign_version" - compile "io.github.openfeign.form:feign-form:$feign_form_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" - compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.github.openfeign:feign-core:$feign_version" + implementation "io.github.openfeign:feign-jackson:$feign_version" + implementation "io.github.openfeign:feign-slf4j:$feign_version" + implementation "io.github.openfeign.form:feign-form:$feign_form_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle index febaebd1b371..8e51bb4bfd91 100644 --- a/samples/client/petstore/java/feign/build.gradle +++ b/samples/client/petstore/java/feign/build.gradle @@ -107,19 +107,19 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.github.openfeign:feign-core:$feign_version" - compile "io.github.openfeign:feign-jackson:$feign_version" - compile "io.github.openfeign:feign-slf4j:$feign_version" - compile "io.github.openfeign.form:feign-form:$feign_form_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" - compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.github.openfeign:feign-core:$feign_version" + implementation "io.github.openfeign:feign-jackson:$feign_version" + implementation "io.github.openfeign:feign-slf4j:$feign_version" + implementation "io.github.openfeign.form:feign-form:$feign_form_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle index 04fba9afc8ed..46ff7e2b4e1d 100644 --- a/samples/client/petstore/java/google-api-client/build.gradle +++ b/samples/client/petstore/java/google-api-client/build.gradle @@ -107,16 +107,16 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.google.api-client:google-api-client:${google_api_client_version}" - compile "org.glassfish.jersey.core:jersey-common:${jersey_common_version}" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.google.api-client:google-api-client:${google_api_client_version}" + implementation "org.glassfish.jersey.core:jersey-common:${jersey_common_version}" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle index 241cbc5b44d0..f5f773e412ca 100644 --- a/samples/client/petstore/java/jersey1/build.gradle +++ b/samples/client/petstore/java/jersey1/build.gradle @@ -122,18 +122,18 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.sun.jersey:jersey-client:$jersey_version" - compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.sun.jersey:jersey-client:$jersey_version" + implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle index e325d1da307f..0b229b0c3904 100644 --- a/samples/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/client/petstore/java/jersey2-java8/build.gradle @@ -104,21 +104,21 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } javadoc { diff --git a/samples/client/petstore/java/native-async/build.gradle b/samples/client/petstore/java/native-async/build.gradle index 7bd9a31250f1..80b7de54bf7d 100644 --- a/samples/client/petstore/java/native-async/build.gradle +++ b/samples/client/petstore/java/native-async/build.gradle @@ -57,14 +57,14 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:0.2.1" - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:0.2.1" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/native/build.gradle b/samples/client/petstore/java/native/build.gradle index 7bd9a31250f1..80b7de54bf7d 100644 --- a/samples/client/petstore/java/native/build.gradle +++ b/samples/client/petstore/java/native/build.gradle @@ -57,14 +57,14 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:0.2.1" - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:0.2.1" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle index 20a03b5ade6c..915c36674c31 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle @@ -98,18 +98,18 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.24' - compile "com.google.code.findbugs:jsr305:3.0.2" - compile 'com.squareup.okhttp3:okhttp:3.14.7' - compile 'com.squareup.okhttp3:logging-interceptor:3.14.7' - compile 'com.google.code.gson:gson:2.8.6' - compile 'io.gsonfire:gson-fire:1.8.4' - compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' - compile 'org.threeten:threetenbp:1.4.3' - compile 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile 'junit:junit:4.13.1' + implementation 'io.swagger:swagger-annotations:1.5.24' + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation 'com.squareup.okhttp3:okhttp:3.14.7' + implementation 'com.squareup.okhttp3:logging-interceptor:3.14.7' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'io.gsonfire:gson-fire:1.8.4' + implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation 'org.threeten:threetenbp:1.4.3' + implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.23' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation 'junit:junit:4.13.1' } javadoc { diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle index 3a9cbd718c68..615ed108d405 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle @@ -98,17 +98,17 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.24' - compile "com.google.code.findbugs:jsr305:3.0.2" - compile 'com.squareup.okhttp3:okhttp:3.14.7' - compile 'com.squareup.okhttp3:logging-interceptor:3.14.7' - compile 'com.google.code.gson:gson:2.8.6' - compile 'io.gsonfire:gson-fire:1.8.4' - compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' - compile 'org.threeten:threetenbp:1.4.3' - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile 'junit:junit:4.13.1' + implementation 'io.swagger:swagger-annotations:1.5.24' + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation 'com.squareup.okhttp3:okhttp:3.14.7' + implementation 'com.squareup.okhttp3:logging-interceptor:3.14.7' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'io.gsonfire:gson-fire:1.8.4' + implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation 'org.threeten:threetenbp:1.4.3' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation 'junit:junit:4.13.1' } javadoc { diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle index 857292fc8af6..08cb8effd2d1 100644 --- a/samples/client/petstore/java/okhttp-gson/build.gradle +++ b/samples/client/petstore/java/okhttp-gson/build.gradle @@ -98,17 +98,17 @@ if(hasProperty('target') && target == 'android') { } dependencies { - compile 'io.swagger:swagger-annotations:1.5.24' - compile "com.google.code.findbugs:jsr305:3.0.2" - compile 'com.squareup.okhttp3:okhttp:3.14.7' - compile 'com.squareup.okhttp3:logging-interceptor:3.14.7' - compile 'com.google.code.gson:gson:2.8.6' - compile 'io.gsonfire:gson-fire:1.8.4' - compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' - compile 'org.threeten:threetenbp:1.4.3' - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile 'junit:junit:4.13.1' + implementation 'io.swagger:swagger-annotations:1.5.24' + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation 'com.squareup.okhttp3:okhttp:3.14.7' + implementation 'com.squareup.okhttp3:logging-interceptor:3.14.7' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'io.gsonfire:gson-fire:1.8.4' + implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.1' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' + implementation 'org.threeten:threetenbp:1.4.3' + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation 'junit:junit:4.13.1' } javadoc { diff --git a/samples/client/petstore/java/rest-assured-jackson/build.gradle b/samples/client/petstore/java/rest-assured-jackson/build.gradle index 33e44f55a5d2..b343bf77f3eb 100644 --- a/samples/client/petstore/java/rest-assured-jackson/build.gradle +++ b/samples/client/petstore/java/rest-assured-jackson/build.gradle @@ -105,18 +105,18 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.rest-assured:rest-assured:$rest_assured_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "com.squareup.okio:okio:$okio_version" - compile "javax.validation:validation-api:2.0.1.Final" - compile "org.hibernate:hibernate-validator:6.0.19.Final" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.rest-assured:rest-assured:$rest_assured_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.squareup.okio:okio:$okio_version" + implementation "javax.validation:validation-api:2.0.1.Final" + implementation "org.hibernate:hibernate-validator:6.0.19.Final" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle index d9ddeae427c7..7b06e86135ec 100644 --- a/samples/client/petstore/java/rest-assured/build.gradle +++ b/samples/client/petstore/java/rest-assured/build.gradle @@ -105,15 +105,15 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.rest-assured:rest-assured:$rest_assured_version" - compile "io.gsonfire:gson-fire:$gson_fire_version" - compile 'com.google.code.gson:gson:$gson_version' - compile "org.threeten:threetenbp:$threetenbp_version" - compile "com.squareup.okio:okio:$okio_version" - compile "javax.validation:validation-api:2.0.1.Final" - compile "org.hibernate:hibernate-validator:6.0.19.Final" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.rest-assured:rest-assured:$rest_assured_version" + implementation "io.gsonfire:gson-fire:$gson_fire_version" + implementation 'com.google.code.gson:gson:$gson_version' + implementation "org.threeten:threetenbp:$threetenbp_version" + implementation "com.squareup.okio:okio:$okio_version" + implementation "javax.validation:validation-api:2.0.1.Final" + implementation "org.hibernate:hibernate-validator:6.0.19.Final" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle index e23483b58276..ae1595b7b4de 100644 --- a/samples/client/petstore/java/resteasy/build.gradle +++ b/samples/client/petstore/java/resteasy/build.gradle @@ -105,19 +105,19 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.jboss.resteasy:resteasy-client:$resteasy_version" - compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version" - compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" - compile "joda-time:joda-time:$jodatime_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.jboss.resteasy:resteasy-client:$resteasy_version" + implementation "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version" + implementation "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version" + implementation "joda-time:joda-time:$jodatime_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle index b7650c1bd236..8c0e142ed191 100644 --- a/samples/client/petstore/java/resttemplate-withXml/build.gradle +++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle @@ -106,17 +106,17 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.springframework:spring-web:$spring_web_version" - compile "org.springframework:spring-context:$spring_web_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" - compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle index dec10adc14ee..e1bb67d5880a 100644 --- a/samples/client/petstore/java/resttemplate/build.gradle +++ b/samples/client/petstore/java/resttemplate/build.gradle @@ -106,16 +106,16 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.springframework:spring-web:$spring_web_version" - compile "org.springframework:spring-context:$spring_web_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle index 87201d8157f6..b9658804ac36 100644 --- a/samples/client/petstore/java/retrofit2-play26/build.gradle +++ b/samples/client/petstore/java/retrofit2-play26/build.gradle @@ -108,24 +108,24 @@ ext { } dependencies { - compile "com.squareup.retrofit2:retrofit:$retrofit_version" - compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" - compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' } - compile "io.gsonfire:gson-fire:$json_fire_version" - compile "org.threeten:threetenbp:$threetenbp_version" - compile "com.typesafe.play:play-ahc-ws_2.12:$play_version" - compile "javax.validation:validation-api:1.1.0.Final" - compile "com.squareup.retrofit2:converter-jackson:$retrofit_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.gsonfire:gson-fire:$json_fire_version" + implementation "org.threeten:threetenbp:$threetenbp_version" + implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version" + implementation "javax.validation:validation-api:1.1.0.Final" + implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle index 0a3a053c7cca..b1b43ae2fb4c 100644 --- a/samples/client/petstore/java/retrofit2/build.gradle +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -104,16 +104,16 @@ ext { } dependencies { - compile "com.squareup.retrofit2:retrofit:$retrofit_version" - compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" - compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' } - compile "io.gsonfire:gson-fire:$json_fire_version" - compile "org.threeten:threetenbp:$threetenbp_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.gsonfire:gson-fire:$json_fire_version" + implementation "org.threeten:threetenbp:$threetenbp_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle index c16e188f769b..9766c51dbf94 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.gradle +++ b/samples/client/petstore/java/retrofit2rx2/build.gradle @@ -105,18 +105,18 @@ ext { } dependencies { - compile "com.squareup.retrofit2:retrofit:$retrofit_version" - compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" - compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' - compile "io.reactivex.rxjava2:rxjava:$rx_java_version" - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' + implementation "io.reactivex.rxjava2:rxjava:$rx_java_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' } - compile "io.gsonfire:gson-fire:$json_fire_version" - compile "org.threeten:threetenbp:$threetenbp_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.gsonfire:gson-fire:$json_fire_version" + implementation "org.threeten:threetenbp:$threetenbp_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/retrofit2rx3/build.gradle b/samples/client/petstore/java/retrofit2rx3/build.gradle index 01ff7ca75bdf..bbb209016f52 100644 --- a/samples/client/petstore/java/retrofit2rx3/build.gradle +++ b/samples/client/petstore/java/retrofit2rx3/build.gradle @@ -105,18 +105,18 @@ ext { } dependencies { - compile "com.squareup.retrofit2:retrofit:$retrofit_version" - compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" - compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' - compile "io.reactivex.rxjava3:rxjava:$rx_java_version" - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' + implementation "io.reactivex.rxjava3:rxjava:$rx_java_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){ exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common' } - compile "io.gsonfire:gson-fire:$json_fire_version" - compile "org.threeten:threetenbp:$threetenbp_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.gsonfire:gson-fire:$json_fire_version" + implementation "org.threeten:threetenbp:$threetenbp_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } diff --git a/samples/client/petstore/java/vertx-no-nullable/build.gradle b/samples/client/petstore/java/vertx-no-nullable/build.gradle index 4c80f2733b9c..594978c848d4 100644 --- a/samples/client/petstore/java/vertx-no-nullable/build.gradle +++ b/samples/client/petstore/java/vertx-no-nullable/build.gradle @@ -36,16 +36,16 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.vertx:vertx-web-client:$vertx_version" - compile "io.vertx:vertx-rx-java:$vertx_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:jackson_threeten_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" - testCompile "io.vertx:vertx-unit:$vertx_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.vertx:vertx-web-client:$vertx_version" + implementation "io.vertx:vertx-rx-java:$vertx_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:jackson_threeten_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" + testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle index e8c07bd6ffb0..656e2d0f6223 100644 --- a/samples/client/petstore/java/vertx/build.gradle +++ b/samples/client/petstore/java/vertx/build.gradle @@ -36,16 +36,16 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.vertx:vertx-web-client:$vertx_version" - compile "io.vertx:vertx-rx-java:$vertx_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" - testCompile "io.vertx:vertx-unit:$vertx_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.vertx:vertx-web-client:$vertx_version" + implementation "io.vertx:vertx-rx-java:$vertx_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" + testImplementation "io.vertx:vertx-unit:$vertx_version" } diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle index 755e80a177f6..d9d933bb2cb0 100644 --- a/samples/client/petstore/java/webclient/build.gradle +++ b/samples/client/petstore/java/webclient/build.gradle @@ -124,18 +124,18 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "io.projectreactor:reactor-core:$reactor_version" - compile "org.springframework:spring-webflux:$spring_web_version" - compile "io.projectreactor.ipc:reactor-netty:$reactor_netty_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "javax.annotation:javax.annotation-api:$javax_annotation_version" - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.projectreactor:reactor-core:$reactor_version" + implementation "org.springframework:spring-webflux:$spring_web_version" + implementation "io.projectreactor.ipc:reactor-netty:$reactor_netty_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "javax.annotation:javax.annotation-api:$javax_annotation_version" + testImplementation "junit:junit:$junit_version" } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle index 95c8daff26a2..ec19a0e4a529 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/build.gradle @@ -104,21 +104,21 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" - compile "com.brsanthu:migbase64:2.2" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version" + implementation "com.brsanthu:migbase64:2.2" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } javadoc { diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle index 39195e959627..6782a226f919 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/build.gradle @@ -103,20 +103,20 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } javadoc { diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle index 76350694251a..a51333628585 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle +++ b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle @@ -105,22 +105,22 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "org.glassfish.jersey.core:jersey-client:$jersey_version" - compile "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" - compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" - compile "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" - compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version" - compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" - compile 'javax.annotation:javax.annotation-api:1.3.2' - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "org.glassfish.jersey.core:jersey-client:$jersey_version" + implementation "org.glassfish.jersey.inject:jersey-hk2:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version" + implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version" + implementation "org.glassfish.jersey.connectors:jersey-apache-connector:$jersey_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "com.github.scribejava:scribejava-apis:$scribejava_apis_version" + implementation "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + testImplementation "junit:junit:$junit_version" } javadoc { diff --git a/samples/openapi3/client/petstore/java/native/build.gradle b/samples/openapi3/client/petstore/java/native/build.gradle index 14b617f2ec87..ee4c7276cf81 100644 --- a/samples/openapi3/client/petstore/java/native/build.gradle +++ b/samples/openapi3/client/petstore/java/native/build.gradle @@ -57,14 +57,14 @@ ext { } dependencies { - compile "io.swagger:swagger-annotations:$swagger_annotations_version" - compile "com.google.code.findbugs:jsr305:3.0.2" - compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" - compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" - compile "org.openapitools:jackson-databind-nullable:0.2.1" - compile 'javax.annotation:javax.annotation-api:1.3.2' - compile "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" - testCompile "junit:junit:$junit_version" + implementation "io.swagger:swagger-annotations:$swagger_annotations_version" + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:0.2.1" + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation "javax.ws.rs:javax.ws.rs-api:$ws_rs_version" + testImplementation "junit:junit:$junit_version" } From c4dbd2cfa3abb85a23ee78c6c7951877a2c9e287 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Fri, 15 Jan 2021 13:27:33 -0800 Subject: [PATCH 21/23] [python] Fixes file upload + download, adds tests (#8437) * Adds tests for file upload and files upload * Adds test_download_attachment * Fixes test_upload_file * Adds download_attachment endpoint * Adds test_download_attachment * Updates assert_request_called_with signature * Samples regen * Adds upload download file spec route and sample gen * Fixes file upload for application/octet-stream, writes test_upload_download_file * Changes if into elif * Improves python code in api_client --- .../main/resources/python/api_client.mustache | 32 +- ...odels-for-testing-with-http-signature.yaml | 138 +++-- .../python/petstore_api/api_client.py | 32 +- .../python/x_auth_id_alias/api_client.py | 32 +- .../python/dynamic_servers/api_client.py | 32 +- .../openapi3/client/petstore/python/README.md | 6 +- .../client/petstore/python/docs/FakeApi.md | 258 ++++++++++ .../client/petstore/python/docs/PetApi.md | 172 ------- .../python/petstore_api/api/fake_api.py | 476 ++++++++++++++++++ .../python/petstore_api/api/pet_api.py | 269 ---------- .../python/petstore_api/api_client.py | 32 +- .../petstore/python/testfiles/1px_pic1.png | Bin 0 -> 67 bytes .../petstore/python/testfiles/1px_pic2.png | Bin 0 -> 67 bytes .../python/tests_manual/test_fake_api.py | 255 +++++++++- 14 files changed, 1154 insertions(+), 580 deletions(-) create mode 100644 samples/openapi3/client/petstore/python/testfiles/1px_pic1.png create mode 100644 samples/openapi3/client/petstore/python/testfiles/1px_pic2.png diff --git a/modules/openapi-generator/src/main/resources/python/api_client.mustache b/modules/openapi-generator/src/main/resources/python/api_client.mustache index aaf14c4af366..9b9a04fefd91 100644 --- a/modules/openapi-generator/src/main/resources/python/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/python/api_client.mustache @@ -199,8 +199,6 @@ class ApiClient(object): e.body = e.body.decode('utf-8') raise e - content_type = response_data.getheader('content-type') - self.last_response = response_data return_data = response_data @@ -214,15 +212,17 @@ class ApiClient(object): {{/tornado}} return return_data - if response_type not in ["file", "bytes"]: - match = None - if content_type is not None: - match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) - encoding = match.group(1) if match else "utf-8" - response_data.data = response_data.data.decode(encoding) - # deserialize response data if response_type: + if response_type != (file_type,): + encoding = "utf-8" + content_type = response_data.getheader('content-type') + if content_type is not None: + match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) + if match: + encoding = match.group(1) + response_data.data = response_data.data.decode(encoding) + return_data = self.deserialize( response_data, response_type, @@ -268,7 +268,7 @@ class ApiClient(object): @classmethod def sanitize_for_serialization(cls, obj): - """Builds a JSON POST object. + """Prepares data for transmission before it is sent with the rest client If obj is None, return None. If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date @@ -276,6 +276,7 @@ class ApiClient(object): If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. + If obj is io.IOBase, return the bytes :param obj: The data to serialize. :return: The serialized form of data. """ @@ -283,6 +284,8 @@ class ApiClient(object): return { key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items() } + elif isinstance(obj, io.IOBase): + return cls.get_file_data_and_close_file(obj) elif isinstance(obj, (str, int, float, none_type, bool)): return obj elif isinstance(obj, (datetime, date)): @@ -526,6 +529,12 @@ class ApiClient(object): new_params.append((k, v)) return new_params + @staticmethod + def get_file_data_and_close_file(file_instance: io.IOBase) -> bytes: + file_data = file_instance.read() + file_instance.close() + return file_data + def files_parameters(self, files: typing.Optional[typing.Dict[str, typing.List[io.IOBase]]] = None): """Builds form parameters. @@ -551,12 +560,11 @@ class ApiClient(object): "for %s must be open." % param_name ) filename = os.path.basename(file_instance.name) - filedata = file_instance.read() + filedata = self.get_file_data_and_close_file(file_instance) mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream') params.append( tuple([param_name, tuple([filename, filedata, mimetype])])) - file_instance.close() return params diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 41a16b1011bd..809235694835 100644 --- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -16,6 +16,8 @@ tags: description: Access to Petstore orders - name: user description: Operations about user + - name: fake + description: Fake api used for feature testing paths: /foo: get: @@ -246,45 +248,6 @@ paths: - petstore_auth: - 'write:pets' - 'read:pets' - '/pet/{petId}/uploadImage': - post: - tags: - - pet - summary: uploads an image - description: '' - operationId: uploadFile - parameters: - - name: petId - in: path - description: ID of pet to update - required: true - schema: - type: integer - format: int64 - responses: - '200': - description: successful operation - content: - application/json: - schema: - $ref: '#/components/schemas/ApiResponse' - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' - requestBody: - content: - multipart/form-data: - schema: - type: object - properties: - additionalMetadata: - description: Additional data to pass to server - type: string - file: - description: file to upload - type: string - format: binary /store/inventory: get: tags: @@ -1196,21 +1159,41 @@ paths: responses: "200": description: Success - '/fake/{petId}/uploadImageWithRequiredFile': - post: + /{fileName}: + get: + servers: + - url: http://www.jtricks.com tags: - - pet - summary: uploads an image (required) - description: '' - operationId: uploadFileWithRequiredFile + - fake + summary: downloads a file using Content-Disposition + operationId: downloadAttachment parameters: - - name: petId + - name: fileName in: path - description: ID of pet to update + description: file name required: true schema: - type: integer - format: int64 + type: string + responses: + 200: + description: successful operation + content: + 'text/plain': + schema: + type: string + format: binary + headers: + Content-Disposition: + schema: + type: string + description: "describes the received file. Looks like: 'attachment; filename=fileName.txt'" + /fake/uploadFile: + post: + tags: + - fake + summary: uploads a file using multipart/form-data + description: '' + operationId: uploadFile responses: '200': description: successful operation @@ -1218,10 +1201,6 @@ paths: application/json: schema: $ref: '#/components/schemas/ApiResponse' - security: - - petstore_auth: - - 'write:pets' - - 'read:pets' requestBody: content: multipart/form-data: @@ -1231,12 +1210,61 @@ paths: additionalMetadata: description: Additional data to pass to server type: string - requiredFile: + file: description: file to upload type: string format: binary required: - - requiredFile + - file + /fake/uploadFiles: + post: + tags: + - fake + summary: uploads files using multipart/form-data + description: '' + operationId: uploadFiles + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + files: + type: array + items: + type: string + format: binary + /fake/uploadDownloadFile: + post: + tags: + - fake + summary: uploads a file and downloads a file using application/octet-stream + description: '' + operationId: uploadDownloadFile + responses: + '200': + description: successful operation + content: + application/octet-stream: + schema: + type: string + format: binary + description: file to download + requestBody: + required: true + content: + application/octet-stream: + schema: + type: string + format: binary + description: file to upload /fake/health: get: tags: diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py index a6472b9579d5..626409660045 100644 --- a/samples/client/petstore/python/petstore_api/api_client.py +++ b/samples/client/petstore/python/petstore_api/api_client.py @@ -201,8 +201,6 @@ class ApiClient(object): e.body = e.body.decode('utf-8') raise e - content_type = response_data.getheader('content-type') - self.last_response = response_data return_data = response_data @@ -211,15 +209,17 @@ class ApiClient(object): return (return_data) return return_data - if response_type not in ["file", "bytes"]: - match = None - if content_type is not None: - match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) - encoding = match.group(1) if match else "utf-8" - response_data.data = response_data.data.decode(encoding) - # deserialize response data if response_type: + if response_type != (file_type,): + encoding = "utf-8" + content_type = response_data.getheader('content-type') + if content_type is not None: + match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) + if match: + encoding = match.group(1) + response_data.data = response_data.data.decode(encoding) + return_data = self.deserialize( response_data, response_type, @@ -256,7 +256,7 @@ class ApiClient(object): @classmethod def sanitize_for_serialization(cls, obj): - """Builds a JSON POST object. + """Prepares data for transmission before it is sent with the rest client If obj is None, return None. If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date @@ -264,6 +264,7 @@ class ApiClient(object): If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. + If obj is io.IOBase, return the bytes :param obj: The data to serialize. :return: The serialized form of data. """ @@ -271,6 +272,8 @@ class ApiClient(object): return { key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items() } + elif isinstance(obj, io.IOBase): + return cls.get_file_data_and_close_file(obj) elif isinstance(obj, (str, int, float, none_type, bool)): return obj elif isinstance(obj, (datetime, date)): @@ -514,6 +517,12 @@ class ApiClient(object): new_params.append((k, v)) return new_params + @staticmethod + def get_file_data_and_close_file(file_instance: io.IOBase) -> bytes: + file_data = file_instance.read() + file_instance.close() + return file_data + def files_parameters(self, files: typing.Optional[typing.Dict[str, typing.List[io.IOBase]]] = None): """Builds form parameters. @@ -539,12 +548,11 @@ class ApiClient(object): "for %s must be open." % param_name ) filename = os.path.basename(file_instance.name) - filedata = file_instance.read() + filedata = self.get_file_data_and_close_file(file_instance) mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream') params.append( tuple([param_name, tuple([filename, filedata, mimetype])])) - file_instance.close() return params diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api_client.py b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api_client.py index 698a75ec9769..ff79b8cbba4d 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api_client.py +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/api_client.py @@ -201,8 +201,6 @@ class ApiClient(object): e.body = e.body.decode('utf-8') raise e - content_type = response_data.getheader('content-type') - self.last_response = response_data return_data = response_data @@ -211,15 +209,17 @@ class ApiClient(object): return (return_data) return return_data - if response_type not in ["file", "bytes"]: - match = None - if content_type is not None: - match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) - encoding = match.group(1) if match else "utf-8" - response_data.data = response_data.data.decode(encoding) - # deserialize response data if response_type: + if response_type != (file_type,): + encoding = "utf-8" + content_type = response_data.getheader('content-type') + if content_type is not None: + match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) + if match: + encoding = match.group(1) + response_data.data = response_data.data.decode(encoding) + return_data = self.deserialize( response_data, response_type, @@ -256,7 +256,7 @@ class ApiClient(object): @classmethod def sanitize_for_serialization(cls, obj): - """Builds a JSON POST object. + """Prepares data for transmission before it is sent with the rest client If obj is None, return None. If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date @@ -264,6 +264,7 @@ class ApiClient(object): If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. + If obj is io.IOBase, return the bytes :param obj: The data to serialize. :return: The serialized form of data. """ @@ -271,6 +272,8 @@ class ApiClient(object): return { key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items() } + elif isinstance(obj, io.IOBase): + return cls.get_file_data_and_close_file(obj) elif isinstance(obj, (str, int, float, none_type, bool)): return obj elif isinstance(obj, (datetime, date)): @@ -514,6 +517,12 @@ class ApiClient(object): new_params.append((k, v)) return new_params + @staticmethod + def get_file_data_and_close_file(file_instance: io.IOBase) -> bytes: + file_data = file_instance.read() + file_instance.close() + return file_data + def files_parameters(self, files: typing.Optional[typing.Dict[str, typing.List[io.IOBase]]] = None): """Builds form parameters. @@ -539,12 +548,11 @@ class ApiClient(object): "for %s must be open." % param_name ) filename = os.path.basename(file_instance.name) - filedata = file_instance.read() + filedata = self.get_file_data_and_close_file(file_instance) mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream') params.append( tuple([param_name, tuple([filename, filedata, mimetype])])) - file_instance.close() return params diff --git a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api_client.py b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api_client.py index 736510bd34d3..54e8236e10d9 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api_client.py +++ b/samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/api_client.py @@ -201,8 +201,6 @@ class ApiClient(object): e.body = e.body.decode('utf-8') raise e - content_type = response_data.getheader('content-type') - self.last_response = response_data return_data = response_data @@ -211,15 +209,17 @@ class ApiClient(object): return (return_data) return return_data - if response_type not in ["file", "bytes"]: - match = None - if content_type is not None: - match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) - encoding = match.group(1) if match else "utf-8" - response_data.data = response_data.data.decode(encoding) - # deserialize response data if response_type: + if response_type != (file_type,): + encoding = "utf-8" + content_type = response_data.getheader('content-type') + if content_type is not None: + match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) + if match: + encoding = match.group(1) + response_data.data = response_data.data.decode(encoding) + return_data = self.deserialize( response_data, response_type, @@ -256,7 +256,7 @@ class ApiClient(object): @classmethod def sanitize_for_serialization(cls, obj): - """Builds a JSON POST object. + """Prepares data for transmission before it is sent with the rest client If obj is None, return None. If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date @@ -264,6 +264,7 @@ class ApiClient(object): If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. + If obj is io.IOBase, return the bytes :param obj: The data to serialize. :return: The serialized form of data. """ @@ -271,6 +272,8 @@ class ApiClient(object): return { key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items() } + elif isinstance(obj, io.IOBase): + return cls.get_file_data_and_close_file(obj) elif isinstance(obj, (str, int, float, none_type, bool)): return obj elif isinstance(obj, (datetime, date)): @@ -514,6 +517,12 @@ class ApiClient(object): new_params.append((k, v)) return new_params + @staticmethod + def get_file_data_and_close_file(file_instance: io.IOBase) -> bytes: + file_data = file_instance.read() + file_instance.close() + return file_data + def files_parameters(self, files: typing.Optional[typing.Dict[str, typing.List[io.IOBase]]] = None): """Builds form parameters. @@ -539,12 +548,11 @@ class ApiClient(object): "for %s must be open." % param_name ) filename = os.path.basename(file_instance.name) - filedata = file_instance.read() + filedata = self.get_file_data_and_close_file(file_instance) mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream') params.append( tuple([param_name, tuple([filename, filedata, mimetype])])) - file_instance.close() return params diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index b7e1090f0344..8939aa5a1318 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -88,6 +88,7 @@ Class | Method | HTTP request | Description *FakeApi* | [**array_of_enums**](docs/FakeApi.md#array_of_enums) | **POST** /fake/refs/array-of-enums | Array of Enums *FakeApi* | [**boolean**](docs/FakeApi.md#boolean) | **POST** /fake/refs/boolean | *FakeApi* | [**composed_one_of_number_with_validations**](docs/FakeApi.md#composed_one_of_number_with_validations) | **POST** /fake/refs/composed_one_of_number_with_validations | +*FakeApi* | [**download_attachment**](docs/FakeApi.md#download_attachment) | **GET** /{fileName} | downloads a file using Content-Disposition *FakeApi* | [**enum_test**](docs/FakeApi.md#enum_test) | **POST** /fake/refs/enum-test | Object contains enum properties and array properties containing enums *FakeApi* | [**fake_health_get**](docs/FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint *FakeApi* | [**mammal**](docs/FakeApi.md#mammal) | **POST** /fake/refs/mammal | @@ -104,6 +105,9 @@ Class | Method | HTTP request | Description *FakeApi* | [**test_inline_additional_properties**](docs/FakeApi.md#test_inline_additional_properties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties *FakeApi* | [**test_json_form_data**](docs/FakeApi.md#test_json_form_data) | **GET** /fake/jsonFormData | test json serialization of form data *FakeApi* | [**test_query_parameter_collection_format**](docs/FakeApi.md#test_query_parameter_collection_format) | **PUT** /fake/test-query-paramters | +*FakeApi* | [**upload_download_file**](docs/FakeApi.md#upload_download_file) | **POST** /fake/uploadDownloadFile | uploads a file and downloads a file using application/octet-stream +*FakeApi* | [**upload_file**](docs/FakeApi.md#upload_file) | **POST** /fake/uploadFile | uploads a file using multipart/form-data +*FakeApi* | [**upload_files**](docs/FakeApi.md#upload_files) | **POST** /fake/uploadFiles | uploads files using multipart/form-data *FakeClassnameTags123Api* | [**test_classname**](docs/FakeClassnameTags123Api.md#test_classname) | **PATCH** /fake_classname_test | To test class name in snake case *PetApi* | [**add_pet**](docs/PetApi.md#add_pet) | **POST** /pet | Add a new pet to the store *PetApi* | [**delete_pet**](docs/PetApi.md#delete_pet) | **DELETE** /pet/{petId} | Deletes a pet @@ -112,8 +116,6 @@ Class | Method | HTTP request | Description *PetApi* | [**get_pet_by_id**](docs/PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID *PetApi* | [**update_pet**](docs/PetApi.md#update_pet) | **PUT** /pet | Update an existing pet *PetApi* | [**update_pet_with_form**](docs/PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data -*PetApi* | [**upload_file**](docs/PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image -*PetApi* | [**upload_file_with_required_file**](docs/PetApi.md#upload_file_with_required_file) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required) *StoreApi* | [**delete_order**](docs/StoreApi.md#delete_order) | **DELETE** /store/order/{order_id} | Delete purchase order by ID *StoreApi* | [**get_inventory**](docs/StoreApi.md#get_inventory) | **GET** /store/inventory | Returns pet inventories by status *StoreApi* | [**get_order_by_id**](docs/StoreApi.md#get_order_by_id) | **GET** /store/order/{order_id} | Find purchase order by ID diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index ae713e6ee67a..a8efca889708 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -9,6 +9,7 @@ Method | HTTP request | Description [**array_of_enums**](FakeApi.md#array_of_enums) | **POST** /fake/refs/array-of-enums | Array of Enums [**boolean**](FakeApi.md#boolean) | **POST** /fake/refs/boolean | [**composed_one_of_number_with_validations**](FakeApi.md#composed_one_of_number_with_validations) | **POST** /fake/refs/composed_one_of_number_with_validations | +[**download_attachment**](FakeApi.md#download_attachment) | **GET** /{fileName} | downloads a file using Content-Disposition [**enum_test**](FakeApi.md#enum_test) | **POST** /fake/refs/enum-test | Object contains enum properties and array properties containing enums [**fake_health_get**](FakeApi.md#fake_health_get) | **GET** /fake/health | Health check endpoint [**mammal**](FakeApi.md#mammal) | **POST** /fake/refs/mammal | @@ -25,6 +26,9 @@ Method | HTTP request | Description [**test_inline_additional_properties**](FakeApi.md#test_inline_additional_properties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties [**test_json_form_data**](FakeApi.md#test_json_form_data) | **GET** /fake/jsonFormData | test json serialization of form data [**test_query_parameter_collection_format**](FakeApi.md#test_query_parameter_collection_format) | **PUT** /fake/test-query-paramters | +[**upload_download_file**](FakeApi.md#upload_download_file) | **POST** /fake/uploadDownloadFile | uploads a file and downloads a file using application/octet-stream +[**upload_file**](FakeApi.md#upload_file) | **POST** /fake/uploadFile | uploads a file using multipart/form-data +[**upload_files**](FakeApi.md#upload_files) | **POST** /fake/uploadFiles | uploads files using multipart/form-data # **additional_properties_with_array_of_enums** @@ -347,6 +351,66 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **download_attachment** +> file_type download_attachment(file_name) + +downloads a file using Content-Disposition + +### Example + +```python +import time +import petstore_api +from petstore_api.api import fake_api +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. +configuration = petstore_api.Configuration( + host = "http://petstore.swagger.io:80/v2" +) + + +# Enter a context with an instance of the API client +with petstore_api.ApiClient() as api_client: + # Create an instance of the API class + api_instance = fake_api.FakeApi(api_client) + file_name = "fileName_example" # str | file name + + # example passing only required values which don't have defaults set + try: + # downloads a file using Content-Disposition + api_response = api_instance.download_attachment(file_name) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->download_attachment: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **file_name** | **str**| file name | + +### Return type + +**file_type** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: text/plain + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | * Content-Disposition - describes the received file. Looks like: 'attachment; filename=fileName.txt'
| + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **enum_test** > EnumTest enum_test() @@ -1489,3 +1553,197 @@ No authorization required [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) +# **upload_download_file** +> file_type upload_download_file(body) + +uploads a file and downloads a file using application/octet-stream + +### Example + +```python +import time +import petstore_api +from petstore_api.api import fake_api +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. +configuration = petstore_api.Configuration( + host = "http://petstore.swagger.io:80/v2" +) + + +# Enter a context with an instance of the API client +with petstore_api.ApiClient() as api_client: + # Create an instance of the API class + api_instance = fake_api.FakeApi(api_client) + body = open('/path/to/file', 'rb') # file_type | + + # example passing only required values which don't have defaults set + try: + # uploads a file and downloads a file using application/octet-stream + api_response = api_instance.upload_download_file(body) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->upload_download_file: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **body** | **file_type**| | + +### Return type + +**file_type** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/octet-stream + - **Accept**: application/octet-stream + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +# **upload_file** +> ApiResponse upload_file(file) + +uploads a file using multipart/form-data + +### Example + +```python +import time +import petstore_api +from petstore_api.api import fake_api +from petstore_api.model.api_response import ApiResponse +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. +configuration = petstore_api.Configuration( + host = "http://petstore.swagger.io:80/v2" +) + + +# Enter a context with an instance of the API client +with petstore_api.ApiClient() as api_client: + # Create an instance of the API class + api_instance = fake_api.FakeApi(api_client) + file = open('/path/to/file', 'rb') # file_type | file to upload + additional_metadata = "additional_metadata_example" # str | Additional data to pass to server (optional) + + # example passing only required values which don't have defaults set + try: + # uploads a file using multipart/form-data + api_response = api_instance.upload_file(file) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->upload_file: %s\n" % e) + + # example passing only required values which don't have defaults set + # and optional values + try: + # uploads a file using multipart/form-data + api_response = api_instance.upload_file(file, additional_metadata=additional_metadata) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->upload_file: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **file** | **file_type**| file to upload | + **additional_metadata** | **str**| Additional data to pass to server | [optional] + +### Return type + +[**ApiResponse**](ApiResponse.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: multipart/form-data + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +# **upload_files** +> ApiResponse upload_files() + +uploads files using multipart/form-data + +### Example + +```python +import time +import petstore_api +from petstore_api.api import fake_api +from petstore_api.model.api_response import ApiResponse +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. +configuration = petstore_api.Configuration( + host = "http://petstore.swagger.io:80/v2" +) + + +# Enter a context with an instance of the API client +with petstore_api.ApiClient() as api_client: + # Create an instance of the API class + api_instance = fake_api.FakeApi(api_client) + files = open('/path/to/file', 'rb') # [file_type] | (optional) + + # example passing only required values which don't have defaults set + # and optional values + try: + # uploads files using multipart/form-data + api_response = api_instance.upload_files(files=files) + pprint(api_response) + except petstore_api.ApiException as e: + print("Exception when calling FakeApi->upload_files: %s\n" % e) +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **files** | **[file_type]**| | [optional] + +### Return type + +[**ApiResponse**](ApiResponse.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: multipart/form-data + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | successful operation | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + diff --git a/samples/openapi3/client/petstore/python/docs/PetApi.md b/samples/openapi3/client/petstore/python/docs/PetApi.md index 3ed215ecf615..87aa32e25a88 100644 --- a/samples/openapi3/client/petstore/python/docs/PetApi.md +++ b/samples/openapi3/client/petstore/python/docs/PetApi.md @@ -11,8 +11,6 @@ Method | HTTP request | Description [**get_pet_by_id**](PetApi.md#get_pet_by_id) | **GET** /pet/{petId} | Find pet by ID [**update_pet**](PetApi.md#update_pet) | **PUT** /pet | Update an existing pet [**update_pet_with_form**](PetApi.md#update_pet_with_form) | **POST** /pet/{petId} | Updates a pet in the store with form data -[**upload_file**](PetApi.md#upload_file) | **POST** /pet/{petId}/uploadImage | uploads an image -[**upload_file_with_required_file**](PetApi.md#upload_file_with_required_file) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required) # **add_pet** @@ -823,173 +821,3 @@ void (empty response body) [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -# **upload_file** -> ApiResponse upload_file(pet_id) - -uploads an image - -### Example - -* OAuth Authentication (petstore_auth): -```python -import time -import petstore_api -from petstore_api.api import pet_api -from petstore_api.model.api_response import ApiResponse -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. -configuration = petstore_api.Configuration( - host = "http://petstore.swagger.io:80/v2" -) - -# The client must configure the authentication and authorization parameters -# in accordance with the API server security policy. -# Examples for each auth method are provided below, use the example that -# satisfies your auth use case. - -# Configure OAuth2 access token for authorization: petstore_auth -configuration = petstore_api.Configuration( - host = "http://petstore.swagger.io:80/v2" -) -configuration.access_token = 'YOUR_ACCESS_TOKEN' - -# Enter a context with an instance of the API client -with petstore_api.ApiClient(configuration) as api_client: - # Create an instance of the API class - api_instance = pet_api.PetApi(api_client) - pet_id = 1 # int | ID of pet to update - additional_metadata = "additional_metadata_example" # str | Additional data to pass to server (optional) - file = open('/path/to/file', 'rb') # file_type | file to upload (optional) - - # example passing only required values which don't have defaults set - try: - # uploads an image - api_response = api_instance.upload_file(pet_id) - pprint(api_response) - except petstore_api.ApiException as e: - print("Exception when calling PetApi->upload_file: %s\n" % e) - - # example passing only required values which don't have defaults set - # and optional values - try: - # uploads an image - api_response = api_instance.upload_file(pet_id, additional_metadata=additional_metadata, file=file) - pprint(api_response) - except petstore_api.ApiException as e: - print("Exception when calling PetApi->upload_file: %s\n" % e) -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **pet_id** | **int**| ID of pet to update | - **additional_metadata** | **str**| Additional data to pass to server | [optional] - **file** | **file_type**| file to upload | [optional] - -### Return type - -[**ApiResponse**](ApiResponse.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: multipart/form-data - - **Accept**: application/json - -### HTTP response details -| Status code | Description | Response headers | -|-------------|-------------|------------------| -**200** | successful operation | - | - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - -# **upload_file_with_required_file** -> ApiResponse upload_file_with_required_file(pet_id, required_file) - -uploads an image (required) - -### Example - -* OAuth Authentication (petstore_auth): -```python -import time -import petstore_api -from petstore_api.api import pet_api -from petstore_api.model.api_response import ApiResponse -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. -configuration = petstore_api.Configuration( - host = "http://petstore.swagger.io:80/v2" -) - -# The client must configure the authentication and authorization parameters -# in accordance with the API server security policy. -# Examples for each auth method are provided below, use the example that -# satisfies your auth use case. - -# Configure OAuth2 access token for authorization: petstore_auth -configuration = petstore_api.Configuration( - host = "http://petstore.swagger.io:80/v2" -) -configuration.access_token = 'YOUR_ACCESS_TOKEN' - -# Enter a context with an instance of the API client -with petstore_api.ApiClient(configuration) as api_client: - # Create an instance of the API class - api_instance = pet_api.PetApi(api_client) - pet_id = 1 # int | ID of pet to update - required_file = open('/path/to/file', 'rb') # file_type | file to upload - additional_metadata = "additional_metadata_example" # str | Additional data to pass to server (optional) - - # example passing only required values which don't have defaults set - try: - # uploads an image (required) - api_response = api_instance.upload_file_with_required_file(pet_id, required_file) - pprint(api_response) - except petstore_api.ApiException as e: - print("Exception when calling PetApi->upload_file_with_required_file: %s\n" % e) - - # example passing only required values which don't have defaults set - # and optional values - try: - # uploads an image (required) - api_response = api_instance.upload_file_with_required_file(pet_id, required_file, additional_metadata=additional_metadata) - pprint(api_response) - except petstore_api.ApiException as e: - print("Exception when calling PetApi->upload_file_with_required_file: %s\n" % e) -``` - -### Parameters - -Name | Type | Description | Notes -------------- | ------------- | ------------- | ------------- - **pet_id** | **int**| ID of pet to update | - **required_file** | **file_type**| file to upload | - **additional_metadata** | **str**| Additional data to pass to server | [optional] - -### Return type - -[**ApiResponse**](ApiResponse.md) - -### Authorization - -[petstore_auth](../README.md#petstore_auth) - -### HTTP request headers - - - **Content-Type**: multipart/form-data - - **Accept**: application/json - -### HTTP response details -| Status code | Description | Response headers | -|-------------|-------------|------------------| -**200** | successful operation | - | - -[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) - diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index 13460a26e1d8..6baed5ea63d1 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -23,6 +23,7 @@ from petstore_api.model_utils import ( # noqa: F401 ) from petstore_api.model.additional_properties_with_array_of_enums import AdditionalPropertiesWithArrayOfEnums from petstore_api.model.animal_farm import AnimalFarm +from petstore_api.model.api_response import ApiResponse from petstore_api.model.array_of_enums import ArrayOfEnums from petstore_api.model.client import Client from petstore_api.model.composed_one_of_number_with_validations import ComposedOneOfNumberWithValidations @@ -606,6 +607,127 @@ class FakeApi(object): callable=__composed_one_of_number_with_validations ) + def __download_attachment( + self, + file_name, + **kwargs + ): + """downloads a file using Content-Disposition # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.download_attachment(file_name, async_req=True) + >>> result = thread.get() + + Args: + file_name (str): file name + + Keyword Args: + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (float/tuple): timeout setting for this request. If one + number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + file_type + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_host_index'] = kwargs.get('_host_index') + kwargs['file_name'] = \ + file_name + return self.call_with_http_info(**kwargs) + + self.download_attachment = _Endpoint( + settings={ + 'response_type': (file_type,), + 'auth': [], + 'endpoint_path': '/{fileName}', + 'operation_id': 'download_attachment', + 'http_method': 'GET', + 'servers': [ + { + 'url': "http://www.jtricks.com", + 'description': "No description provided", + }, + ] + }, + params_map={ + 'all': [ + 'file_name', + ], + 'required': [ + 'file_name', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'file_name': + (str,), + }, + 'attribute_map': { + 'file_name': 'fileName', + }, + 'location_map': { + 'file_name': 'path', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'text/plain' + ], + 'content_type': [], + }, + api_client=api_client, + callable=__download_attachment + ) + def __enum_test( self, **kwargs @@ -2767,3 +2889,357 @@ class FakeApi(object): api_client=api_client, callable=__test_query_parameter_collection_format ) + + def __upload_download_file( + self, + body, + **kwargs + ): + """uploads a file and downloads a file using application/octet-stream # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.upload_download_file(body, async_req=True) + >>> result = thread.get() + + Args: + body (file_type): + + Keyword Args: + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (float/tuple): timeout setting for this request. If one + number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + file_type + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_host_index'] = kwargs.get('_host_index') + kwargs['body'] = \ + body + return self.call_with_http_info(**kwargs) + + self.upload_download_file = _Endpoint( + settings={ + 'response_type': (file_type,), + 'auth': [], + 'endpoint_path': '/fake/uploadDownloadFile', + 'operation_id': 'upload_download_file', + 'http_method': 'POST', + 'servers': None, + }, + params_map={ + 'all': [ + 'body', + ], + 'required': [ + 'body', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'body': + (file_type,), + }, + 'attribute_map': { + }, + 'location_map': { + 'body': 'body', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/octet-stream' + ], + 'content_type': [ + 'application/octet-stream' + ] + }, + api_client=api_client, + callable=__upload_download_file + ) + + def __upload_file( + self, + file, + **kwargs + ): + """uploads a file using multipart/form-data # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.upload_file(file, async_req=True) + >>> result = thread.get() + + Args: + file (file_type): file to upload + + Keyword Args: + additional_metadata (str): Additional data to pass to server. [optional] + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (float/tuple): timeout setting for this request. If one + number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + ApiResponse + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_host_index'] = kwargs.get('_host_index') + kwargs['file'] = \ + file + return self.call_with_http_info(**kwargs) + + self.upload_file = _Endpoint( + settings={ + 'response_type': (ApiResponse,), + 'auth': [], + 'endpoint_path': '/fake/uploadFile', + 'operation_id': 'upload_file', + 'http_method': 'POST', + 'servers': None, + }, + params_map={ + 'all': [ + 'file', + 'additional_metadata', + ], + 'required': [ + 'file', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'file': + (file_type,), + 'additional_metadata': + (str,), + }, + 'attribute_map': { + 'file': 'file', + 'additional_metadata': 'additionalMetadata', + }, + 'location_map': { + 'file': 'form', + 'additional_metadata': 'form', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [ + 'multipart/form-data' + ] + }, + api_client=api_client, + callable=__upload_file + ) + + def __upload_files( + self, + **kwargs + ): + """uploads files using multipart/form-data # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.upload_files(async_req=True) + >>> result = thread.get() + + + Keyword Args: + files ([file_type]): [optional] + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (float/tuple): timeout setting for this request. If one + number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + ApiResponse + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_host_index'] = kwargs.get('_host_index') + return self.call_with_http_info(**kwargs) + + self.upload_files = _Endpoint( + settings={ + 'response_type': (ApiResponse,), + 'auth': [], + 'endpoint_path': '/fake/uploadFiles', + 'operation_id': 'upload_files', + 'http_method': 'POST', + 'servers': None, + }, + params_map={ + 'all': [ + 'files', + ], + 'required': [], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'files': + ([file_type],), + }, + 'attribute_map': { + 'files': 'files', + }, + 'location_map': { + 'files': 'form', + }, + 'collection_format_map': { + 'files': 'csv', + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [ + 'multipart/form-data' + ] + }, + api_client=api_client, + callable=__upload_files + ) diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py index 49e6e0694cdc..7b637be215bb 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py @@ -21,7 +21,6 @@ from petstore_api.model_utils import ( # noqa: F401 none_type, validate_and_convert_types ) -from petstore_api.model.api_response import ApiResponse from petstore_api.model.pet import Pet @@ -915,271 +914,3 @@ class PetApi(object): api_client=api_client, callable=__update_pet_with_form ) - - def __upload_file( - self, - pet_id, - **kwargs - ): - """uploads an image # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - - >>> thread = api.upload_file(pet_id, async_req=True) - >>> result = thread.get() - - Args: - pet_id (int): ID of pet to update - - Keyword Args: - additional_metadata (str): Additional data to pass to server. [optional] - file (file_type): file to upload. [optional] - _return_http_data_only (bool): response data without head status - code and headers. Default is True. - _preload_content (bool): if False, the urllib3.HTTPResponse object - will be returned without reading/decoding response data. - Default is True. - _request_timeout (float/tuple): timeout setting for this request. If one - number provided, it will be total request timeout. It can also - be a pair (tuple) of (connection, read) timeouts. - Default is None. - _check_input_type (bool): specifies if type checking - should be done one the data sent to the server. - Default is True. - _check_return_type (bool): specifies if type checking - should be done one the data received from the server. - Default is True. - _host_index (int/None): specifies the index of the server - that we want to use. - Default is read from the configuration. - async_req (bool): execute request asynchronously - - Returns: - ApiResponse - If the method is called asynchronously, returns the request - thread. - """ - kwargs['async_req'] = kwargs.get( - 'async_req', False - ) - kwargs['_return_http_data_only'] = kwargs.get( - '_return_http_data_only', True - ) - kwargs['_preload_content'] = kwargs.get( - '_preload_content', True - ) - kwargs['_request_timeout'] = kwargs.get( - '_request_timeout', None - ) - kwargs['_check_input_type'] = kwargs.get( - '_check_input_type', True - ) - kwargs['_check_return_type'] = kwargs.get( - '_check_return_type', True - ) - kwargs['_host_index'] = kwargs.get('_host_index') - kwargs['pet_id'] = \ - pet_id - return self.call_with_http_info(**kwargs) - - self.upload_file = _Endpoint( - settings={ - 'response_type': (ApiResponse,), - 'auth': [ - 'petstore_auth' - ], - 'endpoint_path': '/pet/{petId}/uploadImage', - 'operation_id': 'upload_file', - 'http_method': 'POST', - 'servers': None, - }, - params_map={ - 'all': [ - 'pet_id', - 'additional_metadata', - 'file', - ], - 'required': [ - 'pet_id', - ], - 'nullable': [ - ], - 'enum': [ - ], - 'validation': [ - ] - }, - root_map={ - 'validations': { - }, - 'allowed_values': { - }, - 'openapi_types': { - 'pet_id': - (int,), - 'additional_metadata': - (str,), - 'file': - (file_type,), - }, - 'attribute_map': { - 'pet_id': 'petId', - 'additional_metadata': 'additionalMetadata', - 'file': 'file', - }, - 'location_map': { - 'pet_id': 'path', - 'additional_metadata': 'form', - 'file': 'form', - }, - 'collection_format_map': { - } - }, - headers_map={ - 'accept': [ - 'application/json' - ], - 'content_type': [ - 'multipart/form-data' - ] - }, - api_client=api_client, - callable=__upload_file - ) - - def __upload_file_with_required_file( - self, - pet_id, - required_file, - **kwargs - ): - """uploads an image (required) # noqa: E501 - - This method makes a synchronous HTTP request by default. To make an - asynchronous HTTP request, please pass async_req=True - - >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True) - >>> result = thread.get() - - Args: - pet_id (int): ID of pet to update - required_file (file_type): file to upload - - Keyword Args: - additional_metadata (str): Additional data to pass to server. [optional] - _return_http_data_only (bool): response data without head status - code and headers. Default is True. - _preload_content (bool): if False, the urllib3.HTTPResponse object - will be returned without reading/decoding response data. - Default is True. - _request_timeout (float/tuple): timeout setting for this request. If one - number provided, it will be total request timeout. It can also - be a pair (tuple) of (connection, read) timeouts. - Default is None. - _check_input_type (bool): specifies if type checking - should be done one the data sent to the server. - Default is True. - _check_return_type (bool): specifies if type checking - should be done one the data received from the server. - Default is True. - _host_index (int/None): specifies the index of the server - that we want to use. - Default is read from the configuration. - async_req (bool): execute request asynchronously - - Returns: - ApiResponse - If the method is called asynchronously, returns the request - thread. - """ - kwargs['async_req'] = kwargs.get( - 'async_req', False - ) - kwargs['_return_http_data_only'] = kwargs.get( - '_return_http_data_only', True - ) - kwargs['_preload_content'] = kwargs.get( - '_preload_content', True - ) - kwargs['_request_timeout'] = kwargs.get( - '_request_timeout', None - ) - kwargs['_check_input_type'] = kwargs.get( - '_check_input_type', True - ) - kwargs['_check_return_type'] = kwargs.get( - '_check_return_type', True - ) - kwargs['_host_index'] = kwargs.get('_host_index') - kwargs['pet_id'] = \ - pet_id - kwargs['required_file'] = \ - required_file - return self.call_with_http_info(**kwargs) - - self.upload_file_with_required_file = _Endpoint( - settings={ - 'response_type': (ApiResponse,), - 'auth': [ - 'petstore_auth' - ], - 'endpoint_path': '/fake/{petId}/uploadImageWithRequiredFile', - 'operation_id': 'upload_file_with_required_file', - 'http_method': 'POST', - 'servers': None, - }, - params_map={ - 'all': [ - 'pet_id', - 'required_file', - 'additional_metadata', - ], - 'required': [ - 'pet_id', - 'required_file', - ], - 'nullable': [ - ], - 'enum': [ - ], - 'validation': [ - ] - }, - root_map={ - 'validations': { - }, - 'allowed_values': { - }, - 'openapi_types': { - 'pet_id': - (int,), - 'required_file': - (file_type,), - 'additional_metadata': - (str,), - }, - 'attribute_map': { - 'pet_id': 'petId', - 'required_file': 'requiredFile', - 'additional_metadata': 'additionalMetadata', - }, - 'location_map': { - 'pet_id': 'path', - 'required_file': 'form', - 'additional_metadata': 'form', - }, - 'collection_format_map': { - } - }, - headers_map={ - 'accept': [ - 'application/json' - ], - 'content_type': [ - 'multipart/form-data' - ] - }, - api_client=api_client, - callable=__upload_file_with_required_file - ) diff --git a/samples/openapi3/client/petstore/python/petstore_api/api_client.py b/samples/openapi3/client/petstore/python/petstore_api/api_client.py index 022d808ce681..3b0b3e4ea7fd 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/api_client.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api_client.py @@ -201,8 +201,6 @@ class ApiClient(object): e.body = e.body.decode('utf-8') raise e - content_type = response_data.getheader('content-type') - self.last_response = response_data return_data = response_data @@ -211,15 +209,17 @@ class ApiClient(object): return (return_data) return return_data - if response_type not in ["file", "bytes"]: - match = None - if content_type is not None: - match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) - encoding = match.group(1) if match else "utf-8" - response_data.data = response_data.data.decode(encoding) - # deserialize response data if response_type: + if response_type != (file_type,): + encoding = "utf-8" + content_type = response_data.getheader('content-type') + if content_type is not None: + match = re.search(r"charset=([a-zA-Z\-\d]+)[\s\;]?", content_type) + if match: + encoding = match.group(1) + response_data.data = response_data.data.decode(encoding) + return_data = self.deserialize( response_data, response_type, @@ -256,7 +256,7 @@ class ApiClient(object): @classmethod def sanitize_for_serialization(cls, obj): - """Builds a JSON POST object. + """Prepares data for transmission before it is sent with the rest client If obj is None, return None. If obj is str, int, long, float, bool, return directly. If obj is datetime.datetime, datetime.date @@ -264,6 +264,7 @@ class ApiClient(object): If obj is list, sanitize each element in the list. If obj is dict, return the dict. If obj is OpenAPI model, return the properties dict. + If obj is io.IOBase, return the bytes :param obj: The data to serialize. :return: The serialized form of data. """ @@ -271,6 +272,8 @@ class ApiClient(object): return { key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items() } + elif isinstance(obj, io.IOBase): + return cls.get_file_data_and_close_file(obj) elif isinstance(obj, (str, int, float, none_type, bool)): return obj elif isinstance(obj, (datetime, date)): @@ -514,6 +517,12 @@ class ApiClient(object): new_params.append((k, v)) return new_params + @staticmethod + def get_file_data_and_close_file(file_instance: io.IOBase) -> bytes: + file_data = file_instance.read() + file_instance.close() + return file_data + def files_parameters(self, files: typing.Optional[typing.Dict[str, typing.List[io.IOBase]]] = None): """Builds form parameters. @@ -539,12 +548,11 @@ class ApiClient(object): "for %s must be open." % param_name ) filename = os.path.basename(file_instance.name) - filedata = file_instance.read() + filedata = self.get_file_data_and_close_file(file_instance) mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream') params.append( tuple([param_name, tuple([filename, filedata, mimetype])])) - file_instance.close() return params diff --git a/samples/openapi3/client/petstore/python/testfiles/1px_pic1.png b/samples/openapi3/client/petstore/python/testfiles/1px_pic1.png new file mode 100644 index 0000000000000000000000000000000000000000..7d3a386a21026f9b15b2c303a81f5c69333e9056 GIT binary patch literal 67 zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bPE>9Q7kcv6UzxWv#Ss9tmFVH&+ OlJ#`;b6Mw<&;$T@!wsPT literal 0 HcmV?d00001 diff --git a/samples/openapi3/client/petstore/python/testfiles/1px_pic2.png b/samples/openapi3/client/petstore/python/testfiles/1px_pic2.png new file mode 100644 index 0000000000000000000000000000000000000000..7d3a386a21026f9b15b2c303a81f5c69333e9056 GIT binary patch literal 67 zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bPE>9Q7kcv6UzxWv#Ss9tmFVH&+ OlJ#`;b6Mw<&;$T@!wsPT literal 0 HcmV?d00001 diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py index 52e39fb2fbc0..12fb6163684a 100644 --- a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py +++ b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py @@ -11,13 +11,15 @@ import sys from collections import namedtuple -import unittest +import os import json +import unittest from unittest.mock import patch import petstore_api from petstore_api.api.fake_api import FakeApi # noqa: E501 from petstore_api.rest import RESTClientObject, RESTResponse +from petstore_api.model_utils import file_type HTTPResponse = namedtuple( 'urllib3_response_HTTPResponse', @@ -52,22 +54,35 @@ class TestFakeApi(unittest.TestCase): return RESTResponse(http_response) @staticmethod - def assert_request_called_with(mock_method, url, value): - mock_method.assert_called_with( - 'POST', - url, + def assert_request_called_with( + mock_method, + url, + accept='application/json', + http_method='POST', + **kwargs + ): + headers = { + 'Accept': accept, + 'User-Agent': 'OpenAPI-Generator/1.0.0/python', + } + if 'content_type' in kwargs: + headers['Content-Type'] = kwargs['content_type'] + used_kwargs = dict( _preload_content=True, _request_timeout=None, - body=value, - headers={ - 'Accept': 'application/json', - 'User-Agent': 'OpenAPI-Generator/1.0.0/python', - 'Content-Type': 'application/json' - }, - post_params=[], + headers=headers, query_params=[] ) - + if 'post_params' in kwargs: + used_kwargs['post_params'] = kwargs['post_params'] + if 'body' in kwargs: + used_kwargs['body'] = kwargs['body'] + else: + mock_method.assert_called_with( + http_method, + url, + **used_kwargs + ) def test_array_model(self): """Test case for array_model @@ -86,7 +101,7 @@ class TestFakeApi(unittest.TestCase): mock_method.return_value = self.mock_response(json_data) response = endpoint(body=body) - self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/arraymodel', json_data) + self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/arraymodel', body=json_data) assert isinstance(response, animal_farm.AnimalFarm) assert response == body @@ -143,7 +158,7 @@ class TestFakeApi(unittest.TestCase): response = endpoint(enum_test=body) self.assert_request_called_with( - mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', json_value) + mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', body=json_value) assert isinstance(response, EnumTest) assert response == body @@ -159,7 +174,7 @@ class TestFakeApi(unittest.TestCase): response = endpoint(enum_test=body) self.assert_request_called_with( - mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', json_value) + mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum-test', body=json_value) assert isinstance(response, EnumTest) assert response == body @@ -183,7 +198,7 @@ class TestFakeApi(unittest.TestCase): mock_method.return_value = self.mock_response(value_simple) response = endpoint(array_of_enums=body) - self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/array-of-enums', value_simple) + self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/array-of-enums', body=value_simple) assert isinstance(response, array_of_enums.ArrayOfEnums) assert response.value == value @@ -204,7 +219,7 @@ class TestFakeApi(unittest.TestCase): mock_method.return_value = self.mock_response(value) response = endpoint(body=body) - self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/number', value) + self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/number', body=value) assert isinstance(response, number_with_validations.NumberWithValidations) assert response.value == value @@ -247,7 +262,7 @@ class TestFakeApi(unittest.TestCase): self.assert_request_called_with( mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/object_model_with_ref_props', - json_payload + body=json_payload ) assert isinstance(response, expected_model.__class__) @@ -285,7 +300,7 @@ class TestFakeApi(unittest.TestCase): self.assert_request_called_with( mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/composed_one_of_number_with_validations', - value_simple + body=value_simple ) assert isinstance(response, body.__class__) @@ -306,7 +321,7 @@ class TestFakeApi(unittest.TestCase): mock_method.return_value = self.mock_response(value_simple) response = endpoint(body=body) - self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/string', value_simple) + self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/string', body=value_simple) assert isinstance(response, str) assert response == value_simple @@ -328,11 +343,207 @@ class TestFakeApi(unittest.TestCase): mock_method.return_value = self.mock_response(value) response = endpoint(body=body) - self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum', value) + self.assert_request_called_with(mock_method, 'http://petstore.swagger.io:80/v2/fake/refs/enum', body=value) assert isinstance(response, string_enum.StringEnum) assert response.value == value + def test_upload_file(self): + # uploads a file + test_file_dir = os.path.realpath( + os.path.join(os.path.dirname(__file__), "..", "testfiles")) + file_path1 = os.path.join(test_file_dir, "1px_pic1.png") + + headers = {} + def get_headers(): + return headers + def get_header(name, default=None): + return headers.get(name, default) + api_respponse = { + 'code': 200, + 'type': 'blah', + 'message': 'file upload succeeded' + } + http_response = HTTPResponse( + status=200, + reason='OK', + data=json.dumps(api_respponse).encode('utf-8'), + getheaders=get_headers, + getheader=get_header + ) + mock_response = RESTResponse(http_response) + file1 = open(file_path1, "rb") + try: + with patch.object(RESTClientObject, 'request') as mock_method: + mock_method.return_value = mock_response + res = self.api.upload_file( + file=file1) + body = None + post_params=[ + ('file', ('1px_pic1.png', b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x00\x00\x00\x00:~\x9bU\x00\x00\x00\nIDATx\x9cc\xfa\x0f\x00\x01\x05\x01\x02\xcf\xa0.\xcd\x00\x00\x00\x00IEND\xaeB`\x82', 'image/png')), + ] + self.assert_request_called_with( + mock_method, + 'http://petstore.swagger.io:80/v2/fake/uploadFile', + body=body, post_params=post_params, content_type='multipart/form-data' + ) + except petstore_api.ApiException as e: + self.fail("upload_file() raised {0} unexpectedly".format(type(e))) + finally: + file1.close() + + # passing in an array of files to when file only allows one + # raises an exceptions + try: + file = open(file_path1, "rb") + with self.assertRaises(petstore_api.ApiTypeError) as exc: + self.api.upload_file(file=[file]) + finally: + file.close() + + # passing in a closed file raises an exception + with self.assertRaises(petstore_api.ApiValueError) as exc: + file = open(file_path1, "rb") + file.close() + self.api.upload_file(file=file) + + def test_upload_files(self): + test_file_dir = os.path.realpath( + os.path.join(os.path.dirname(__file__), "..", "testfiles")) + file_path1 = os.path.join(test_file_dir, "1px_pic1.png") + file_path2 = os.path.join(test_file_dir, "1px_pic2.png") + + headers = {} + def get_headers(): + return headers + def get_header(name, default=None): + return headers.get(name, default) + api_respponse = { + 'code': 200, + 'type': 'blah', + 'message': 'file upload succeeded' + } + http_response = HTTPResponse( + status=200, + reason='OK', + data=json.dumps(api_respponse).encode('utf-8'), + getheaders=get_headers, + getheader=get_header + ) + mock_response = RESTResponse(http_response) + file1 = open(file_path1, "rb") + file2 = open(file_path2, "rb") + try: + with patch.object(RESTClientObject, 'request') as mock_method: + mock_method.return_value = mock_response + res = self.api.upload_files( + files=[file1, file2]) + post_params=[ + ('files', ('1px_pic1.png', b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x00\x00\x00\x00:~\x9bU\x00\x00\x00\nIDATx\x9cc\xfa\x0f\x00\x01\x05\x01\x02\xcf\xa0.\xcd\x00\x00\x00\x00IEND\xaeB`\x82', 'image/png')), + ('files', ('1px_pic2.png', b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x00\x00\x00\x00:~\x9bU\x00\x00\x00\nIDATx\x9cc\xfa\x0f\x00\x01\x05\x01\x02\xcf\xa0.\xcd\x00\x00\x00\x00IEND\xaeB`\x82', 'image/png')) + ] + self.assert_request_called_with( + mock_method, + 'http://petstore.swagger.io:80/v2/fake/uploadFiles', + body=None, post_params=post_params, content_type='multipart/form-data' + ) + except petstore_api.ApiException as e: + self.fail("upload_file() raised {0} unexpectedly".format(type(e))) + finally: + file1.close() + file2.close() + + # passing in a single file when an array of file is required + # raises an exception + try: + file = open(file_path1, "rb") + with self.assertRaises(petstore_api.ApiTypeError) as exc: + self.api.upload_files(files=file) + finally: + file.close() + + def test_download_attachment(self): + """Ensures that file deserialization works""" + + # sample from http://www.jtricks.com/download-text + file_name = 'content.txt' + headers = {'Content-Disposition': 'attachment; filename={}'.format(file_name), 'Content-Type': 'text/plain'} + def get_headers(): + return headers + def get_header(name, default=None): + return headers.get(name, default) + file_data = ( + "You are reading text file that was supposed to be downloaded\r\n" + "to your hard disk. If your browser offered to save you the file," + "\r\nthen it handled the Content-Disposition header correctly." + ) + http_response = HTTPResponse( + status=200, + reason='OK', + data=file_data, + getheaders=get_headers, + getheader=get_header + ) + # deserialize response to a file + mock_response = RESTResponse(http_response) + with patch.object(RESTClientObject, 'request') as mock_method: + mock_method.return_value = mock_response + try: + file_object = self.api.download_attachment(file_name='download-text') + self.assert_request_called_with( + mock_method, + 'http://www.jtricks.com/download-text', + http_method='GET', + accept='text/plain', + ) + self.assertTrue(isinstance(file_object, file_type)) + self.assertFalse(file_object.closed) + self.assertEqual(file_object.read(), file_data.encode('utf-8')) + finally: + file_object.close() + os.unlink(file_object.name) + + def test_upload_download_file(self): + test_file_dir = os.path.realpath( + os.path.join(os.path.dirname(__file__), "..", "testfiles")) + file_path1 = os.path.join(test_file_dir, "1px_pic1.png") + + with open(file_path1, "rb") as f: + expected_file_data = f.read() + + headers = {'Content-Type': 'application/octet-stream'} + def get_headers(): + return headers + def get_header(name, default=None): + return headers.get(name, default) + http_response = HTTPResponse( + status=200, + reason='OK', + data=expected_file_data, + getheaders=get_headers, + getheader=get_header + ) + mock_response = RESTResponse(http_response) + file1 = open(file_path1, "rb") + try: + with patch.object(RESTClientObject, 'request') as mock_method: + mock_method.return_value = mock_response + downloaded_file = self.api.upload_download_file(body=file1) + self.assert_request_called_with( + mock_method, + 'http://petstore.swagger.io:80/v2/fake/uploadDownloadFile', + body=expected_file_data, content_type='application/octet-stream' + ) + self.assertTrue(isinstance(downloaded_file, file_type)) + self.assertFalse(downloaded_file.closed) + self.assertEqual(downloaded_file.read(), expected_file_data) + except petstore_api.ApiException as e: + self.fail("upload_download_file() raised {0} unexpectedly".format(type(e))) + finally: + file1.close() + downloaded_file.close() + os.unlink(downloaded_file.name) + def test_test_body_with_file_schema(self): """Test case for test_body_with_file_schema From cd2a0db1ceec984baafb5eb8383bc475c117806c Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Fri, 15 Jan 2021 22:51:12 +0100 Subject: [PATCH 22/23] Fix counting for large API solutions in generated Python README (#8403) * Fix counting for large API solutions Let 2 follow 1. * Update Python samples with new readme --- .../src/main/resources/python/README_common.mustache | 2 +- samples/client/petstore/python/README.md | 2 +- .../openapi3/client/extensions/x-auth-id-alias/python/README.md | 2 +- .../openapi3/client/features/dynamic-servers/python/README.md | 2 +- samples/openapi3/client/petstore/python/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/python/README_common.mustache b/modules/openapi-generator/src/main/resources/python/README_common.mustache index ec525d175bc2..9999f508c833 100644 --- a/modules/openapi-generator/src/main/resources/python/README_common.mustache +++ b/modules/openapi-generator/src/main/resources/python/README_common.mustache @@ -100,7 +100,7 @@ Use specific imports for apis and models like: - `from {{{packageName}}}.api.default_api import DefaultApi` - `from {{{packageName}}}.model.pet import Pet` -Solution 1: +Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys diff --git a/samples/client/petstore/python/README.md b/samples/client/petstore/python/README.md index 956094cd13fd..5f53c0f64235 100644 --- a/samples/client/petstore/python/README.md +++ b/samples/client/petstore/python/README.md @@ -235,7 +235,7 @@ Use specific imports for apis and models like: - `from petstore_api.api.default_api import DefaultApi` - `from petstore_api.model.pet import Pet` -Solution 1: +Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/README.md b/samples/openapi3/client/extensions/x-auth-id-alias/python/README.md index 32ee2ef8e48d..86eababfa80a 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/README.md +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/README.md @@ -134,7 +134,7 @@ Use specific imports for apis and models like: - `from x_auth_id_alias.api.default_api import DefaultApi` - `from x_auth_id_alias.model.pet import Pet` -Solution 1: +Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys diff --git a/samples/openapi3/client/features/dynamic-servers/python/README.md b/samples/openapi3/client/features/dynamic-servers/python/README.md index 318fc75414b5..df93218ea4b8 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/README.md +++ b/samples/openapi3/client/features/dynamic-servers/python/README.md @@ -103,7 +103,7 @@ Use specific imports for apis and models like: - `from dynamic_servers.api.default_api import DefaultApi` - `from dynamic_servers.model.pet import Pet` -Solution 1: +Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 8939aa5a1318..61aebac0aa19 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -275,7 +275,7 @@ Use specific imports for apis and models like: - `from petstore_api.api.default_api import DefaultApi` - `from petstore_api.model.pet import Pet` -Solution 1: +Solution 2: Before importing the package, adjust the maximum recursion limit as shown below: ``` import sys From e9c850fd4e31165eb4a64f9aecbd45abc97691da Mon Sep 17 00:00:00 2001 From: Justin Black Date: Sun, 17 Jan 2021 12:28:17 -0800 Subject: [PATCH 23/23] Adds isNull to codegenX java core classes that represent schemas (#8462) * Adds isNull to all schema classes * Adds null model and property samples, adds models test of isNull * Adds isNull tests for parameter and response also * Reverts version file --- .../openapitools/codegen/CodegenModel.java | 15 ++++- .../codegen/CodegenParameter.java | 16 ++++- .../openapitools/codegen/CodegenProperty.java | 15 ++++- .../openapitools/codegen/CodegenResponse.java | 15 ++++- .../openapitools/codegen/DefaultCodegen.java | 8 +++ .../IJsonSchemaValidationProperties.java | 4 ++ .../codegen/DefaultCodegenTest.java | 31 +++++++++ .../src/test/resources/3_0/issue_7651.yaml | 65 +++++++++++++++++++ 8 files changed, 165 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index 05bd2946bac5..4bcb5dd4bf94 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -95,6 +95,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { public boolean isArray; public boolean hasChildren; public boolean isMap; + public boolean isNull; /** * Indicates the OAS schema specifies "deprecated: true". */ @@ -702,6 +703,16 @@ public class CodegenModel implements IJsonSchemaValidationProperties { this.xmlPrefix = xmlPrefix; } + @Override + public boolean getIsNull() { + return isNull; + } + + @Override + public void setIsNull(boolean isNull) { + this.isNull = isNull; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -730,6 +741,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { isMap == that.isMap && isDeprecated == that.isDeprecated && hasOnlyReadOnly == that.hasOnlyReadOnly && + isNull == that.isNull && getUniqueItems() == that.getUniqueItems() && getExclusiveMinimum() == that.getExclusiveMinimum() && getExclusiveMaximum() == that.getExclusiveMaximum() && @@ -794,7 +806,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { getDescription(), getClassVarName(), getModelJson(), getDataType(), getXmlPrefix(), getXmlNamespace(), getXmlName(), getClassFilename(), getUnescapedDescription(), getDiscriminator(), getDefaultValue(), getArrayModelType(), isAlias, isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, - isDate, isDateTime, + isDate, isDateTime, isNull, getVars(), getAllVars(), getRequiredVars(), getOptionalVars(), getReadOnlyVars(), getReadWriteVars(), getParentVars(), getAllowableValues(), getMandatory(), getAllMandatory(), getImports(), hasVars, isEmptyVars(), hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArray, @@ -885,6 +897,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties { sb.append(", items='").append(items).append('\''); sb.append(", additionalProperties='").append(additionalProperties).append('\''); sb.append(", isModel='").append(isModel).append('\''); + sb.append(", isNull='").append(isNull); sb.append('}'); return sb.toString(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 39cca3eeb7a5..7c6f80ae8430 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -101,6 +101,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public Number multipleOf; private Integer maxProperties; private Integer minProperties; + public boolean isNull; public CodegenParameter copy() { CodegenParameter output = new CodegenParameter(); @@ -147,6 +148,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { output.minimum = this.minimum; output.pattern = this.pattern; output.additionalProperties = this.additionalProperties; + output.isNull = this.isNull; if (this._enum != null) { output._enum = new ArrayList(this._enum); @@ -200,7 +202,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull); } @Override @@ -244,6 +246,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { hasValidation == that.hasValidation && isNullable == that.isNullable && required == that.required && + isNull == that.isNull && getExclusiveMaximum() == that.getExclusiveMaximum() && getExclusiveMinimum() == that.getExclusiveMinimum() && getUniqueItems() == that.getUniqueItems() && @@ -357,6 +360,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { sb.append(", uniqueItems=").append(uniqueItems); sb.append(", contentType=").append(contentType); sb.append(", multipleOf=").append(multipleOf); + sb.append(", isNull=").append(isNull); sb.append('}'); return sb.toString(); } @@ -568,5 +572,15 @@ public class CodegenParameter implements IJsonSchemaValidationProperties { public void setRequiredVars(List requiredVars) { this.requiredVars = requiredVars; } + + @Override + public boolean getIsNull() { + return isNull; + } + + @Override + public void setIsNull(boolean isNull) { + this.isNull = isNull; + } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index c3cbfe569250..b956a3ea7e19 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -132,6 +132,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti public boolean isUuid; public boolean isUri; public boolean isEmail; + public boolean isNull; /** * The type is a free-form object, i.e. it is a map of string to values with no declared properties. * A OAS free-form schema may include the 'additionalProperties' attribute, which puts a constraint @@ -676,6 +677,16 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti this.requiredVars = requiredVars; } + @Override + public boolean getIsNull() { + return isNull; + } + + @Override + public void setIsNull(boolean isNull) { + this.isNull = isNull; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenProperty{"); @@ -764,6 +775,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti sb.append(", xmlName='").append(xmlName).append('\''); sb.append(", xmlNamespace='").append(xmlNamespace).append('\''); sb.append(", isXmlWrapped=").append(isXmlWrapped); + sb.append(", isNull=").append(isNull); sb.append('}'); return sb.toString(); } @@ -812,6 +824,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti isInherited == that.isInherited && isXmlAttribute == that.isXmlAttribute && isXmlWrapped == that.isXmlWrapped && + isNull == that.isNull && Objects.equals(openApiType, that.openApiType) && Objects.equals(baseName, that.baseName) && Objects.equals(complexType, that.complexType) && @@ -873,6 +886,6 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase, nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName, - xmlNamespace, isXmlWrapped); + xmlNamespace, isXmlWrapped, isNull); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index b3ceedb149aa..7762676b7ca8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -57,6 +57,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { public boolean isArray; public boolean isBinary = false; public boolean isFile = false; + public boolean isNull; public Object schema; public String jsonSchema; public Map vendorExtensions = new HashMap(); @@ -84,7 +85,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBoolean, isDate, isDateTime, isUuid, isEmail, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType, isMap, isArray, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, additionalProperties, - vars, requiredVars, + vars, requiredVars, isNull, getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(), getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(), is1xx, is2xx, is3xx, is4xx, is5xx); @@ -122,6 +123,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { isFile == that.isFile && items == that.items && additionalProperties == that.additionalProperties && + isNull == that.isNull && is1xx == that.is1xx && is2xx == that.is2xx && is3xx == that.is3xx && @@ -423,6 +425,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { sb.append(", additionalProperties='").append(additionalProperties).append('\''); sb.append(", vars='").append(vars).append('\''); sb.append(", requiredVars='").append(requiredVars).append('\''); + sb.append(", isNull='").append(isNull); sb.append('}'); return sb.toString(); } @@ -443,4 +446,14 @@ public class CodegenResponse implements IJsonSchemaValidationProperties { return true; return false; } + + @Override + public boolean getIsNull() { + return isNull; + } + + @Override + public void setIsNull(boolean isNull) { + this.isNull = isNull; + } } 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 9738f9a94529..9f063bef496b 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 @@ -2306,6 +2306,8 @@ public class DefaultCodegen implements CodegenConfig { m.arrayModelType = arrayProperty.complexType; addParentContainer(m, name, schema); ModelUtils.syncValidationProperties(schema, m); + } else if (ModelUtils.isNullType(schema)) { + m.isNull = true; } else if (schema instanceof ComposedSchema) { final ComposedSchema composed = (ComposedSchema) schema; Map properties = new LinkedHashMap(); @@ -3279,6 +3281,8 @@ public class DefaultCodegen implements CodegenConfig { innerSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to undefined type"); p.setAdditionalProperties(innerSchema); } + } else if (ModelUtils.isNullType(p)) { + property.isNull = true; } //Inline enum case: @@ -4044,6 +4048,7 @@ public class DefaultCodegen implements CodegenConfig { if (r.schema != null) { Map allSchemas = null; CodegenProperty cp = fromProperty("response", responseSchema); + r.isNull = cp.isNull; if (ModelUtils.isArraySchema(responseSchema)) { ArraySchema as = (ArraySchema) responseSchema; @@ -4317,6 +4322,8 @@ public class DefaultCodegen implements CodegenConfig { imports.add(codegenProperty.baseType); codegenProperty = codegenProperty.items; } + } else if (ModelUtils.isNullType(parameterSchema)) { + codegenParameter.isNull = true; } /* TODO revise the logic below } else { @@ -6146,6 +6153,7 @@ public class DefaultCodegen implements CodegenConfig { } else { codegenParameter.baseName = bodyParameterName; } + codegenParameter.isNull = codegenProperty.isNull; codegenParameter.isPrimitiveType = true; codegenParameter.baseType = codegenProperty.baseType; codegenParameter.dataType = codegenProperty.dataType; 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 7a1a0323a083..9b0ad0f89f95 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 @@ -90,4 +90,8 @@ public interface IJsonSchemaValidationProperties { List getRequiredVars(); void setRequiredVars(List requiredVars); + + boolean getIsNull(); + + void setIsNull(boolean isNull); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 9233174859a1..87959fbb2ed5 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -2557,6 +2557,23 @@ public class DefaultCodegenTest { assertEquals(cm.isString, false); assertEquals(cm.isDate, true); + modelName = "NullModel"; + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.isNull, true); + + modelName = "ObjectWithTypeNullProperties"; + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getVars().get(0).isNull, true); + assertEquals(cm.getVars().get(1).getItems().isNull, true); + assertEquals(cm.getAdditionalProperties().isNull, true); + + modelName = "ArrayOfNulls"; + sc = openAPI.getComponents().getSchemas().get(modelName); + cm = codegen.fromModel(modelName, sc); + assertEquals(cm.getItems().isNull, true); + modelName = "ObjectWithDateWithValidation"; sc = openAPI.getComponents().getSchemas().get(modelName); cm = codegen.fromModel(modelName, sc); @@ -2618,6 +2635,20 @@ public class DefaultCodegenTest { assertEquals(co.bodyParams.get(0).isDateTime, true); assertEquals(co.responses.get(0).isString, false); assertEquals(co.responses.get(0).isDateTime, true); + + path = "/null/{param}"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + assertEquals(co.pathParams.get(0).isNull, true); + assertEquals(co.bodyParams.get(0).isNull, true); + assertEquals(co.responses.get(0).isNull, true); + + path = "/ref_null/{param}"; + operation = openAPI.getPaths().get(path).getPost(); + co = codegen.fromOperation(path, "POST", operation, null); + assertEquals(co.pathParams.get(0).isNull, true); + assertEquals(co.bodyParams.get(0).isNull, true); + assertEquals(co.responses.get(0).isNull, true); } @Test diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_7651.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_7651.yaml index ce2bfff7fac7..f35d64b4b358 100644 --- a/modules/openapi-generator/src/test/resources/3_0/issue_7651.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/issue_7651.yaml @@ -120,8 +120,73 @@ paths: type: string format: date-time pattern: '^2020.*' + /null/{param}: + post: + tags: + - isX + operationId: null + parameters: + - name: param + in: path + required: true + schema: + type: 'null' + requestBody: + content: + application/json: + schema: + type: 'null' + required: true + responses: + 200: + description: success + content: + application/json: + schema: + type: 'null' + /ref_null/{param}: + post: + tags: + - isX + operationId: null + parameters: + - name: param + in: path + required: true + schema: + $ref: '#/components/schemas/NullModel' + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/NullModel' + required: true + responses: + 200: + description: success + content: + application/json: + schema: + $ref: '#/components/schemas/NullModel' components: schemas: + NullModel: + type: 'null' + ObjectWithTypeNullProperties: + type: object + properties: + nullProp: + type: 'null' + listOfNulls: + type: array + items: + type: 'null' + additionalProperties: + type: 'null' + ArrayOfNulls: + type: array + items: + type: 'null' DateWithValidation: type: string format: date